Add hooks to preselect postfix options

Update TLS

PR:		42047
Submitted by:	maintainer, knu

33 files changed, 517 insertions, 341 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix
index 76c1729b0189..9a5d3bc8c1a0 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix1/distinfo
+++ b/mail/postfix1/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix
index 5e82eadf0ed7..c7d01cba9bea 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix20/distinfo
+++ b/mail/postfix20/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix
index 0c46a1e95e99..af7eb044326d 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix21/distinfo
+++ b/mail/postfix21/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix
index d25f5439ea98..ab884c198dd8 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix22/distinfo
+++ b/mail/postfix22/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
index fc7f93f702a7..95854f0e47fd 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix23/distinfo
+++ b/mail/postfix23/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix
index cd9ce64734c2..2a3729d2d765 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix24/distinfo
+++ b/mail/postfix24/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix
index 3da23d68d026..c5b0d143b063 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix
index 3eee034519d8..655b4bce7922 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix
index 01d88285824a..6092c3d47cdf 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix27/distinfo
+++ b/mail/postfix27/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix
index 416a6ec95af9..51193eba3c4f 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index c894d272351f..6b47f15e39d2 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -5,6 +5,12 @@
 # $FreeBSD$
 #
 
+# To pre-select options in batch mode, run make like this:
+#
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#
+# the options are the same names as in the scripts/configure.postfix file
+
 PORTNAME=	postfix
 PORTVERSION=	1.1.11
 PORTEPOCH=	1
@@ -46,6 +52,7 @@ MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
+		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
index 439098303783..379358ed4749 100644
--- a/mail/postfix28/distinfo
+++ b/mail/postfix28/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix
index e304833a87ae..bce09e9962c4 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.23 2002-06-20 01:32:20 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -7,27 +7,35 @@ fi
 
 tempfile=`mktemp -t checklist`
 
-if [ "${BATCH}" = "yes" ]; then
-	set \"PCRE\"
+if [ "${POSTFIX_OPTIONS}" ]; then
+	set ${POSTFIX_OPTIONS}
 else
+	set PCRE
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-PgSQL		"PostgreSQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
+DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+MySQL		"MySQL map lookups" "$status_MySQL" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -50,16 +58,16 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		\"PCRE\")
+for i; do
+	case $i in
+		PCRE)
 			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
 			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
-		\"SASL\")
+		SASL)
 			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -78,29 +86,29 @@ while [ "$1" ]; do
 			echo ".endif"
 			SUB_SASL=""
 			;;
-		\"TLS\")
+		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.11a-1.1.11-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
-		\"DB3\")
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
+		DB3)
+			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
 			echo "DB3_SUFFIX=	+db3"
 			;;
-		\"MySQL\")
+		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
-		\"PgSQL\")
+		PgSQL)
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
@@ -109,23 +117,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		\"OpenLDAP\")
+		OpenLDAP)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
-		\"Test\")
+		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
-		\"IPv6\")
+		IPv6)
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
+				exit 1
 			fi
-			if [ X$SUB_TLS = "X" ]; then
+			if [ -z $SUB_TLS ]; then
 				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
@@ -136,13 +144,14 @@ while [ "$1" ]; do
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
+	        "")
+			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""