upgrade to version 2.0.2

PR:	ports/47110
Submitted by:	maintainer

5 files changed, 67 insertions, 19 deletions

diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index f75e2d5770bf..ef0e8cf2f428 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -13,7 +13,7 @@
 # POSTFIX_OPTIONS can be set in /etc/make.conf also.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.0.2
+PORTVERSION=	2.0.2
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -105,7 +105,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/postfix1/distinfo b/mail/postfix1/distinfo
index 9ed106bfeb1a..3994232beb8c 100644
--- a/mail/postfix1/distinfo
+++ b/mail/postfix1/distinfo
@@ -1,4 +1,4 @@
-MD5 (postfix/postfix-2.0.0.2.tar.gz) = 1e51a2290d33ee498f9abe91dbb27dc2
-MD5 (postfix/pfixtls-0.8.12-2.0.0.1-0.9.6h.tar.gz) = 1111b97c77e71b2f7edd9ab6d36fb550
-MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
-MD5 (postfix/tls+ipv6-1.10-pf-2.0.0.1.patch.gz) = ed18c6933fa81961bcbd1e3a28493487
+MD5 (postfix/postfix-2.0.2.tar.gz) = b64114648412cb89756b96dce7f59948
+MD5 (postfix/pfixtls-0.8.13-2.0.1-0.9.7.tar.gz) = 420470e2bd0225650783a60374435108
+MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/tls+ipv6-1.11-pf-2.0.1.patch.gz) = c9257b67259d2e3e5a626a1fb0708764
diff --git a/mail/postfix1/pkg-message b/mail/postfix1/pkg-message
index a7ae2b17e2a6..88417961f3af 100644
--- a/mail/postfix1/pkg-message
+++ b/mail/postfix1/pkg-message
@@ -10,8 +10,19 @@ 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_status_mail_rejects_enable="NO"                                      
@@ -23,3 +34,6 @@ 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 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/postfix1/pkg-plist b/mail/postfix1/pkg-plist
index 6d882a8666a7..c102595ef4bf 100644
--- a/mail/postfix1/pkg-plist
+++ b/mail/postfix1/pkg-plist
@@ -62,6 +62,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
@@ -152,6 +153,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
diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix
index 9748cf729525..e9d75a686158 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.26 2003-01-09 05:10:39 petef Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.27 2003-01-19 07:25:46 sada Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -24,14 +24,16 @@ Please select desired options:" -1 -1 16 \
 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" \
+TLS		"SSL and TLS" "$status_TLS" \
+IPv6		"IPv6 support (currently broken)" "$status_IPv6" \
+IPv6TLS		"IPv6 support with SSL and TLS" "$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" \
 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=$?
@@ -111,17 +113,47 @@ while [ "$1" ]; do
 			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.12-2.0.0.1-0.9.6h.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.12-2.0.0.1-0.9.6h/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.1-0.9.7.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.1-0.9.7/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"
@@ -136,7 +168,7 @@ while [ "$1" ]; do
 			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 "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
 		OpenLDAP)
@@ -176,10 +208,10 @@ while [ "$1" ]; do
 			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.10/"
-			echo "PATCHFILES+=	tls+ipv6-1.10-pf-2.0.0.1.patch.gz"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.11/"
+			echo "PATCHFILES+=	tls+ipv6-1.11-pf-2.0.1.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+ipv6+tls"
+			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
 			;;
 		*)
@@ -198,4 +230,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=	\${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"