Update postfix-current port to the latest release of the experimental line

of postfix.  Brings configurable feature set up to same level as postfix port,
except that IPv6 patches do not apply (patch author needs to update them).

PR:		54767
Submitted by:	maintainer

6 files changed, 163 insertions, 73 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 49c0a4f8b93f..2bf8cb24f831 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -7,14 +7,15 @@
 
 # To pre-select options in batch mode, run make like this:
 #
-#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
 #
 # the options are the same names as in the scripts/configure.postfix file.
 # POSTFIX_OPTIONS can be set in /etc/make.conf also.
 
+# NOTE: PCRE is enabled by default unless you specifically disable it.
+
 PORTNAME=	postfix
-PORTVERSION=	1.1.11-20021115
-#PORTREVISION=	1
+PORTVERSION=	2.0.14-20030717
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -28,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
@@ -37,21 +38,19 @@ MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
 	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
 	postsuper.1 sendmail.1
 
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
+MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 pcre_table.5 regexp_table.5 \
+	relocated.5 tcp_table.5 transport.5 virtual.5
 
 MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \
-	smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
+	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
+	smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8
 
 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 # patch it.
 MAN8base=$(MAN8:S/tlsmgr.8//)
 
-NO_LATEST_LINK=	yes
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
+CONF1=	main.cf master.cf access aliases canonical cidr_table pcre_table \
+	regexp_table relocated tcp_table transport virtual
 
 .if !defined(DEBUG)
 MAKEFILEFLAGS+=	DEBUG=
@@ -71,6 +70,14 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+.if defined(WITHOUT_PCRE)
+POSTFIX_CCARGS+=	-DNO_PCRE
+.else
+LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
+POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
+POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
+.endif
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
@@ -107,7 +114,7 @@ READMEDIR=${PREFIX}/share/doc/postfix
 .endif
 
 do-install:
-	cd ${WRKSRC}; sh postfix-install -non-interactive install_root=/ tempdir=/tmp \
+	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
 	 config_directory=${PREFIX}/etc/postfix \
 	 daemon_directory=${PREFIX}/libexec/postfix \
 	 command_directory=${PREFIX}/sbin \
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 2d7112fc0fb8..619964df119f 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,4 +1,2 @@
-MD5 (postfix/postfix-1.1.11-20021115.tar.gz) = dd3c98b616844a3548049bbaa418c296
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-20021031-0.9.6g.tar.gz) = 1fc29989315ab5570486929c24187626
-MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
-MD5 (postfix/tls+ipv6-1.8-pf-1.1.11-20021115.patch) = f01d9a0e28fb3d1a59614f2093ad24f3
+MD5 (postfix/postfix-2.0.14-20030717.tar.gz) = 82709b0742d886f345d718aa941b154d
+MD5 (postfix/pfixtls-0.8.15a-2.0.14-20030715-0.9.7b.tar.gz) = b7572506f62cd5c64614128a5f0491e3
diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install
index 1ef1fb5b2089..9285c64bdbc2 100644
--- a/mail/postfix-current/pkg-install
+++ b/mail/postfix-current/pkg-install
@@ -3,8 +3,19 @@
 #	$FreeBSD$
 #
 
+# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
+# will make the port/package use defaults which makes postfix replaces
+# sendmail as much as possible.
+
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 BATCH=${BATCH:=no}
+POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
+
+if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
+    DEFAULT_REPLACE_MAILERCONF=n
+else
+    DEFAULT_REPLACE_MAILERCONF=y
+fi
 
 ask() {
     local question default answer
@@ -98,8 +109,8 @@ if [ x"$2" = xPRE-INSTALL ]; then
 fi
 
 if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
+	CONF1="main.cf master.cf access aliases canonical cidr_table \
+	pcre_table regexp_table relocated tcp_table transport virtual"
 
 	for file in $CONF1
 	do
@@ -147,7 +158,8 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
         OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
     fi
     if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
+        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" \
+	    ${DEFAULT_REPLACE_MAILERCONF}; then
             mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
             echo "#"						>  /etc/mail/mailer.conf
             echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
diff --git a/mail/postfix-current/pkg-message b/mail/postfix-current/pkg-message
index ba4a1f29f387..1c9fd6699bb9 100644
--- a/mail/postfix-current/pkg-message
+++ b/mail/postfix-current/pkg-message
@@ -10,15 +10,31 @@ sendmail_msp_queue_enable="NO"
 
 This will disable Sendmail completely.
 
+Alternatively to the above settings, you can enable postfix to start with
+the other local services, for example, after your database server starts if
+you need it to be running for postfix.  To do this, set in your rc.conf file:
 
-Also, you may wish to disable some Sendmail-specific daily maintenance
+sendmail_enable="NONE"                                
+
+Then make the following symbolic link:
+
+cd /usr/local/etc/rc.d
+ln -s /usr/local/sbin/postfix postfix.sh
+
+
+Also, you will want to disable some Sendmail-specific daily maintenance
 routines in your /etc/periodic.conf file:
 
+daily_clean_hoststat_enable="NO"
 daily_status_mail_rejects_enable="NO"                                      
 daily_status_include_submit_mailq="NO"
 daily_submit_queuerun="NO"
 
 
 If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group cyrus and
-making the /usr/local/etc/sasldb* file(s) owned by group cyrus.
+the sasldb file.  This is accomplished by adding postfix to group mail and
+making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
+be the default for new installs).
+
+If you are upgrading from postfix version prior to 2.0, please see the README
+files for recommended changes to your configuration.
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 1006679cd978..d1b095dfdff3 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -3,20 +3,24 @@
 @unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
 @unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
 @unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
+@unexec if cmp -s %D/etc/postfix/cidr_table %D/etc/postfix/sample-cidr_table; then rm -f %D/etc/postfix/cidr_table; fi
 @unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
 @unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
 @unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
+@unexec if cmp -s %D/etc/postfix/tcp_table %D/etc/postfix/sample-tcp_table; then rm -f %D/etc/postfix/tcp_table; fi
 @unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
 @unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
 bin/rmail
 etc/postfix/LICENSE
 etc/postfix/main.cf.default
+etc/postfix/makedefs.out
 etc/postfix/post-install
 etc/postfix/postfix-files
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
 etc/postfix/sample-canonical
+etc/postfix/sample-cidr_table
 etc/postfix/sample-pcre_table
 etc/postfix/sample-regexp_table
 etc/postfix/sample-relocated
@@ -37,6 +41,7 @@ etc/postfix/sample-misc.cf
 etc/postfix/sample-pcre-access.cf
 etc/postfix/sample-pcre-body.cf
 etc/postfix/sample-pcre-header.cf
+etc/postfix/sample-pgsql-aliases.cf
 etc/postfix/sample-qmqpd.cf
 etc/postfix/sample-rate.cf
 etc/postfix/sample-regexp-access.cf
@@ -45,11 +50,14 @@ etc/postfix/sample-regexp-header.cf
 etc/postfix/sample-relocated.cf
 etc/postfix/sample-resource.cf
 etc/postfix/sample-rewrite.cf
+etc/postfix/sample-scheduler.cf
 etc/postfix/sample-smtp.cf
 etc/postfix/sample-smtpd.cf
+etc/postfix/sample-tcp_table
 etc/postfix/sample-transport.cf
 etc/postfix/sample-virtual.cf
 etc/postfix/sample-transport
+etc/postfix/sample-verify.cf
 etc/postfix/sample-virtual
 %%SUB_TLS%%etc/postfix/sample-tls.cf
 libexec/postfix/bounce
@@ -62,6 +70,7 @@ libexec/postfix/master
 libexec/postfix/nqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
+libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
 libexec/postfix/showq
@@ -69,6 +78,7 @@ libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
+libexec/postfix/verify
 libexec/postfix/virtual
 %%SUB_TLS%%libexec/postfix/tlsmgr
 sbin/postalias
@@ -87,6 +97,8 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
+%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
+%%PORTDOCS%%share/doc/postfix/ADDRESS_VERIFICATION_README
 %%PORTDOCS%%share/doc/postfix/DB_README
 %%PORTDOCS%%share/doc/postfix/DEBUG_README
 %%PORTDOCS%%share/doc/postfix/ETRN_README
@@ -94,15 +106,19 @@ bin/mailq
 %%PORTDOCS%%share/doc/postfix/INSTALL
 %%PORTDOCS%%share/doc/postfix/LDAP_README
 %%PORTDOCS%%share/doc/postfix/LINUX_README
+%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
 %%PORTDOCS%%share/doc/postfix/LMTP_README
 %%PORTDOCS%%share/doc/postfix/MACOSX_README
+%%PORTDOCS%%share/doc/postfix/MAILDROP_README
 %%PORTDOCS%%share/doc/postfix/MYSQL_README
 %%PORTDOCS%%share/doc/postfix/NFS_README
 %%PORTDOCS%%share/doc/postfix/PACKAGE_README
 %%PORTDOCS%%share/doc/postfix/PCRE_README
 %%PORTDOCS%%share/doc/postfix/QMQP_README
+%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
 %%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
 %%PORTDOCS%%share/doc/postfix/SASL_README
+%%PORTDOCS%%share/doc/postfix/SCHEDULER_README
 %%PORTDOCS%%share/doc/postfix/ULTRIX_README
 %%PORTDOCS%%share/doc/postfix/UUCP_README
 %%PORTDOCS%%share/doc/postfix/VERP_README
@@ -116,6 +132,7 @@ bin/mailq
 %%PORTDOCS%%share/doc/postfix/big-picture.html
 %%PORTDOCS%%share/doc/postfix/bounce.8.html
 %%PORTDOCS%%share/doc/postfix/canonical.5.html
+%%PORTDOCS%%share/doc/postfix/cidr_table.5.html
 %%PORTDOCS%%share/doc/postfix/cleanup.8.html
 %%PORTDOCS%%share/doc/postfix/commands.html
 %%PORTDOCS%%share/doc/postfix/defer.8.html
@@ -148,6 +165,7 @@ bin/mailq
 %%PORTDOCS%%share/doc/postfix/postmap.1.html
 %%PORTDOCS%%share/doc/postfix/postqueue.1.html
 %%PORTDOCS%%share/doc/postfix/postsuper.1.html
+%%PORTDOCS%%share/doc/postfix/proxymap.8.html
 %%PORTDOCS%%share/doc/postfix/qmgr.8.html
 %%PORTDOCS%%share/doc/postfix/qmqpd.8.html
 %%PORTDOCS%%share/doc/postfix/queuing.html
@@ -164,9 +182,12 @@ bin/mailq
 %%PORTDOCS%%share/doc/postfix/smtp.8.html
 %%PORTDOCS%%share/doc/postfix/smtpd.8.html
 %%PORTDOCS%%share/doc/postfix/spawn.8.html
+%%PORTDOCS%%share/doc/postfix/tcp_table.5.html
+%%PORTDOCS%%share/doc/postfix/trace.8.html
 %%PORTDOCS%%share/doc/postfix/transport.5.html
 %%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
 %%PORTDOCS%%share/doc/postfix/uce.html
+%%PORTDOCS%%share/doc/postfix/verify.8.html
 %%PORTDOCS%%share/doc/postfix/virtual.5.html
 %%PORTDOCS%%share/doc/postfix/virtual.8.html
 %%PORTDOCS%%@dirrm share/doc/postfix
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index ea744b8b193c..c98fc90580f0 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -9,8 +9,6 @@ tempfile=`mktemp -t checklist`
 
 if [ "${POSTFIX_OPTIONS}" ]; then
 	set ${POSTFIX_OPTIONS}
-else
-	set PCRE
 fi
 
 for i; do
@@ -21,17 +19,23 @@ 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" "$status_PCRE" \
+NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
+TLS		"SSL and TLS" "$status_TLS" \
+IPv6		"IPv6 support (broken)" "$status_IPv6" \
+IPv6TLS		"IPv6 support with SSL and TLS (broken)" "$status_IPv6TLS" \
 DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
+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" \
+PgSQL		"PostgreSQL v7.3 map lookups" "$status_PgSQL" \
+PgSQL72		"PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
+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" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support (currently broken)" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
 2> $tempfile
 
 	retval=$?
@@ -62,12 +66,10 @@ SUB_TEST="@comment "
 
 while [ "$1" ]; do
 	case $1 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=""
+		NOPCRE)
+			echo "WITHOUT_PCRE=	yes"
+			echo "NOPCRE_SUFFIX=	+nopcre"
+			SUB_NOPCRE=""
 			;;
                 SASL)
                         echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
@@ -79,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -98,30 +94,58 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -ldes -lcom_err"
-			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		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-20021031-0.9.6g.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-20021031-0.9.6g/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.15a-2.0.14-20030715-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15a-2.0.14-20030715-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
 		DB3)
+			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
+				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+				exit 1
+			fi
 			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"
+			echo "DB_SUFFIX=	+db3"
+			DB3_SELECTED="YES"
+			;;
+		DB40)
+			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
+				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+				exit 1
+			fi
+			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
+			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
+			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
+			echo "DB_SUFFIX=	+db40"
+			DB40_SELECTED="YES"
+			;;
+		DB41)
+			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
+				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+				exit 1
+			fi
+			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
+			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
+			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
+			echo "DB_SUFFIX=	+db41"
+			DB41_SELECTED="YES"
 			;;
 		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
@@ -135,34 +159,45 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
 			echo "PGSQL_SUFFIX=	+pgsql"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
-			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		PgSQL72)
+			echo "POSTGRESQL_PORT?=	databases/postgresql72"
+			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
+			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
+			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
+			echo "PGSQL_SUFFIX=	+pgsql"
+			;;
+		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"
 			SUB_TEST=""
 			;;
 		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
-			fi
 			if [ X$SUB_TLS = "X" ]; then
 				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			echo "PATCH_SITES+=	http://www.cyber-magic.org/~taka/misc/"
-			echo "PATCHFILES+=	postfix-1.1.11+ipv6.patch.gz"
-			echo "PATCH_DIST_STRIP= -p1"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12-20030621.patch.gz"
+			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			IPv6SELECTED=YES
@@ -174,12 +209,13 @@ 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.8/"
-			echo "PATCHFILES+=	tls+ipv6-1.8-pf-1.1.11-20021115.patch"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12-20030621.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+ipv6+tls"
+			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
 			;;
 		*)
@@ -198,4 +234,4 @@ echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
 # we ask the configure questions) doesn't pick up the extensions, but
 # any subsequent build will.  so "make; make install" will build twice.
 # don't do this for now.
-#echo "PKGNAMESUFFIX=	\${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
+#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"