Update to latest snapshot

Add IS_INTERACTIVE

PR:		36623
Submitted by:	maintainer

5 files changed, 24 insertions, 10 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 35f7dd3076ba..fa85c1c7d388 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	20020115
-PORTREVISION=	2
+PORTVERSION=	1.1.7-20020331
+PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -16,12 +16,13 @@ MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		ftp://ftp.samurai.com/pub/postfix/experimental/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/experimental/&,}
 MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	snapshot-${PORTVERSION}
+DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
 
 USE_SUBMAKE=	yes
+IS_INTERACTIVE=	yes
 
 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 \
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 492954dc787b..89ad2295f56a 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,2 +1,2 @@
-MD5 (postfix/snapshot-20020115.tar.gz) = d1f53c0767e09ab48fd0a9a7307674f8
-MD5 (postfix/pfixtls-0.7.15-1.1.0-0.9.6c.tar.gz) = f45fe15a623ffa22a17cbf2f977a5c62
+MD5 (postfix/postfix-1.1.7-20020331.tar.gz) = 1198606e529250dcfdfcd4544aa58b40
+MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1
diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install
index 24bdf1d98728..3ef249b885b1 100644
--- a/mail/postfix-current/pkg-install
+++ b/mail/postfix-current/pkg-install
@@ -142,7 +142,19 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
             echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
             echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
             echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "Done."
+	    cat <<'EOM'
+To enable postfix to start at boot time, please set these variables in
+your /etc/rc.conf file:
+
+sendmail_enable="YES"
+sendmail_flags="-bd"
+sendmail_outbound_enable="NO"
+sendmail_submit_enable="NO"
+sendmail_msp_queue_enable="NO"
+
+This will disable Sendmail completely.
+
+EOM
         fi
     else
         if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 6fb4d1ca6d99..5b6c3c55d5b6 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -90,6 +90,7 @@ bin/mailq
 %%PORTDOCS%%share/doc/postfix/DEBUG_README
 %%PORTDOCS%%share/doc/postfix/ETRN_README
 %%PORTDOCS%%share/doc/postfix/FILTER_README
+%%PORTDOCS%%share/doc/postfix/INSTALL
 %%PORTDOCS%%share/doc/postfix/LDAP_README
 %%PORTDOCS%%share/doc/postfix/LINUX_README
 %%PORTDOCS%%share/doc/postfix/LMTP_README
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index 1024264c9872..bbfb3ef8f351 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -14,12 +14,12 @@ else
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
 PCRE		"Perl Compatible Regular Expressions" OFF \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" OFF \
 DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
 MySQL		"MySQL 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 \
+TLS		"SSL and Transport Layer Security (CURRENTLY BROKEN)" OFF \
 IPv6		"IPv6 support (CURRENTLY BROKEN)" OFF \
 2> $tempfile
 
@@ -79,8 +79,8 @@ 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.7.15-1.1.0-0.9.6c.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.7.15-1.1.0-0.9.6c/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			SUB_TLS=""
 			;;