upgrade postfix-current to latest release (Attila Nagy <bra@fsn.hu>)

add POSTFIX_OPTIONS variable setting from make.conf (knu)

PR:		42928
Submitted by:	maintainer

8 files changed, 127 insertions, 81 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 8c35e96adfed..83a99f09b76a 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -5,8 +5,15 @@
 # $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.
+# POSTFIX_OPTIONS can be set in /etc/make.conf also.
+
 PORTNAME=	postfix
-PORTVERSION=	1.1.11-20020822
+PORTVERSION=	1.1.11-20020917
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -48,6 +55,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-current/distinfo b/mail/postfix-current/distinfo
index 018d169b5dfb..541014625ae8 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,4 +1,4 @@
-MD5 (postfix/postfix-1.1.11-20020822.tar.gz) = 1a82f18a9ce23dc7c6d29d7023281067
+MD5 (postfix/postfix-1.1.11-20020917.tar.gz) = d5c4edd83db08a4306840fef321bb42a
 MD5 (postfix/pfixtls-0.8.11a-1.1.11-20020822-0.9.6g.tar.gz) = 45661443f25719094ebb537d4865c07e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
 MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
diff --git a/mail/postfix-current/files/patch-bl b/mail/postfix-current/files/patch-bl
index 176c7d1b64de..043266f9af92 100644
--- a/mail/postfix-current/files/patch-bl
+++ b/mail/postfix-current/files/patch-bl
@@ -1,11 +1,17 @@
-*** ./html/regexp_table.5.html.orig	Sat Apr 22 20:28:38 2000
---- ./html/regexp_table.5.html	Thu Jun  1 22:32:44 2000
-***************
-*** 11,13 ****
-  <b>SYNOPSIS</b>
-!        regexp:/etc/postfix/filename
-  
---- 11,13 ----
-  <b>SYNOPSIS</b>
-!        regexp:!!PREFIX!!/etc/postfix/filename
-  
+--- html/regexp_table.5.html.orig	Wed Sep 18 15:05:45 2002
++++ html/regexp_table.5.html	Wed Sep 18 15:06:32 2002
+@@ -5,11 +5,11 @@
+        regexp_table - format of Postfix regular expression tables
+ 
+ <b>SYNOPSIS</b>
+-       <b>regexp:/etc/postfix/</b><i>filename</i>
++       <b>regexp:!!PREFIX!!/etc/postfix/</b><i>filename</i>
+ 
+-       <b>postmap</b> <b>-q</b> <b>"</b><i>string</i><b>"</b> <b>regexp:/etc/postfix/</b><i>filename</i>
++       <b>postmap</b> <b>-q</b> <b>"</b><i>string</i><b>"</b> <b>regexp:!!PREFIX!!/etc/postfix/</b><i>filename</i>
+ 
+-       <b>postmap</b> <b>-q</b> <b>-</b> <b>regexp:/etc/postfix/</b><i>filename</i> &lt;<i>inputfile</i>
++       <b>postmap</b> <b>-q</b> <b>-</b> <b>regexp:!!PREFIX!!/etc/postfix/</b><i>filename</i> &lt;<i>inputfile</i>
+ 
+ <b>DESCRIPTION</b>
+        The Postfix mail system uses optional tables  for  address
diff --git a/mail/postfix-current/files/patch-cc b/mail/postfix-current/files/patch-cc
index cd6946003217..44127faf192d 100644
--- a/mail/postfix-current/files/patch-cc
+++ b/mail/postfix-current/files/patch-cc
@@ -1,11 +1,17 @@
-*** ./man/man5/pcre_table.5.orig	Thu Mar 30 14:05:28 2000
---- ./man/man5/pcre_table.5	Thu Jun  1 22:39:34 2000
-***************
-*** 10,12 ****
-  .nf
-! pcre:/etc/postfix/filename
-  .SH DESCRIPTION
---- 10,12 ----
-  .nf
-! pcre:!!PREFIX!!/etc/postfix/filename
-  .SH DESCRIPTION
+--- man/man5/pcre_table.5.orig	Wed Sep 18 15:12:38 2002
++++ man/man5/pcre_table.5	Wed Sep 18 15:13:05 2002
+@@ -8,11 +8,11 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpcre:/etc/postfix/\fIfilename\fR
++\fBpcre:!!PREFIX!!/etc/postfix/\fIfilename\fR
+ 
+-\fBpostmap -q "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
++\fBpostmap -q "\fIstring\fB" pcre:!!PREFIX!!/etc/postfix/\fIfilename\fR
+ 
+-\fBpostmap -q - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -q - pcre:!!PREFIX!!/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
diff --git a/mail/postfix-current/files/patch-cf b/mail/postfix-current/files/patch-cf
index 28fb053b94a7..92c90926a595 100644
--- a/mail/postfix-current/files/patch-cf
+++ b/mail/postfix-current/files/patch-cf
@@ -1,11 +1,17 @@
-*** ./man/man5/regexp_table.5.orig	Thu Mar 30 14:05:28 2000
---- ./man/man5/regexp_table.5	Thu Jun  1 22:40:43 2000
-***************
-*** 10,12 ****
-  .nf
-! regexp:/etc/postfix/filename
-  .SH DESCRIPTION
---- 10,12 ----
-  .nf
-! regexp:!!PREFIX!!/etc/postfix/filename
-  .SH DESCRIPTION
+--- man/man5/regexp_table.5.orig	Tue Sep 17 18:54:44 2002
++++ man/man5/regexp_table.5	Wed Sep 18 15:14:25 2002
+@@ -8,11 +8,11 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBregexp:/etc/postfix/\fIfilename\fR
++\fBregexp:!!PREFIX!!/etc/postfix/\fIfilename\fR
+ 
+-\fBpostmap -q "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
++\fBpostmap -q "\fIstring\fB" regexp:!!PREFIX!!/etc/postfix/\fIfilename\fR
+ 
+-\fBpostmap -q - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -q - regexp:!!PREFIX!!/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
diff --git a/mail/postfix-current/files/patch-da b/mail/postfix-current/files/patch-da
index e57e31750d18..d258adb098dd 100644
--- a/mail/postfix-current/files/patch-da
+++ b/mail/postfix-current/files/patch-da
@@ -1,11 +1,17 @@
-*** ./proto/regexp_table.orig	Wed Mar  8 19:18:20 2000
---- ./proto/regexp_table	Thu Jun  1 22:44:43 2000
-***************
-*** 6,8 ****
-  # SYNOPSIS
-! #	regexp:/etc/postfix/filename
-  # DESCRIPTION
---- 6,8 ----
-  # SYNOPSIS
-! #	regexp:!!PREFIX!!/etc/postfix/filename
-  # DESCRIPTION
+--- proto/regexp_table.orig	Tue Sep 17 18:54:42 2002
++++ proto/regexp_table	Wed Sep 18 15:16:26 2002
+@@ -4,11 +4,11 @@
+ # SUMMARY
+ #	format of Postfix regular expression tables
+ # SYNOPSIS
+-#	\fBregexp:/etc/postfix/\fIfilename\fR
++#	\fBregexp:!!PREFIX!!/etc/postfix/\fIfilename\fR
+ #
+-#	\fBpostmap -q "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
++#	\fBpostmap -q "\fIstring\fB" regexp:!!PREFIX!!/etc/postfix/\fIfilename\fR
+ #
+-#	\fBpostmap -q - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++#	\fBpostmap -q - regexp:!!PREFIX!!/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+ # DESCRIPTION
+ #	The Postfix mail system uses optional tables for address
+ #	rewriting or mail routing. These tables are usually in
diff --git a/mail/postfix-current/files/patch-dd b/mail/postfix-current/files/patch-dd
index b65a57ff7d57..82ba3c0b12ed 100644
--- a/mail/postfix-current/files/patch-dd
+++ b/mail/postfix-current/files/patch-dd
@@ -1,11 +1,17 @@
-*** ./proto/pcre_table.orig	Wed Mar  8 19:18:11 2000
---- ./proto/pcre_table	Thu Jun  1 22:45:41 2000
-***************
-*** 6,8 ****
-  # SYNOPSIS
-! #	pcre:/etc/postfix/filename
-  # DESCRIPTION
---- 6,8 ----
-  # SYNOPSIS
-! #	pcre:!!PREFIX!!/etc/postfix/filename
-  # DESCRIPTION
+--- proto/pcre_table.orig	Tue Sep 17 18:54:38 2002
++++ proto/pcre_table	Wed Sep 18 15:18:11 2002
+@@ -4,11 +4,11 @@
+ # SUMMARY
+ #	format of Postfix PCRE tables
+ # SYNOPSIS
+-#	\fBpcre:/etc/postfix/\fIfilename\fR
++#	\fBpcre:!!PREFIX!!/etc/postfix/\fIfilename\fR
+ #
+-#	\fBpostmap -q "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
++#	\fBpostmap -q "\fIstring\fB" pcre:!!PREFIX!!/etc/postfix/\fIfilename\fR
+ #
+-#	\fBpostmap -q - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++#	\fBpostmap -q - pcre:!!PREFIX!!/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+ # DESCRIPTION
+ #	The Postfix mail system uses optional tables for address
+ #	rewriting or mail routing. These tables are usually in
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index a55fe39f2da1..b4481e939102 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -7,28 +7,36 @@ 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 SASLv1 (Simple Authentication and Security Layer)" OFF \
-SASL2		"Cyrus SASLv2 (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		"SSL and TLS" OFF \
-IPv6		"IPv6 support (currently broken)" OFF \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
+SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+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		"SSL and TLS (currently broken)" "$status_TLS" \
+IPv6		"IPv6 support (currently broken)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
-		set `cat $tempfile`
+		set `sed 's/"//g' $tempfile`
 	fi
 	rm -f $tempfile
 
@@ -53,14 +61,14 @@ SUB_TEST="@comment "
 
 while [ "$1" ]; do
 	case $1 in
-		\"PCRE\")
+		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 -I\${LOCALBASE}/include/sasl1"
                         echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
@@ -79,7 +87,7 @@ while [ "$1" ]; do
                         echo ".endif"
                         SUB_SASL=""
                         ;;
-		\"SASL2\")
+		SASL2)
 			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
@@ -98,7 +106,7 @@ 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"
@@ -108,19 +116,19 @@ while [ "$1" ]; do
 			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"
@@ -129,17 +137,17 @@ 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