Update to latest

PR:		39543
Submitted by:	maintainer

4 files changed, 23 insertions, 8 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index de17148d2563..eecf2052eca8 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	1.1.10-20020514
+PORTVERSION=	1.1.11-20020613
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 7a6dd572a11f..85f2452b36c4 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,3 +1,4 @@
-MD5 (postfix/postfix-1.1.10-20020514.tar.gz) = b6445a740fbf5ce8d157335ebb75e019
-MD5 (postfix/postfix-1.1.9+ipv6.patch.gz) = 6ac3b3e201d2d31d28542a3b5ad1d096
+MD5 (postfix/postfix-1.1.11-20020613.tar.gz) = 7c7f2f27463539c00c6bfe8bf50bc0d9
+MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-20020613-0.9.6d.tar.gz) = 6ed63e3941e8de1a9ca4c884dbc84125
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install
index 5acdbac8d974..1ef1fb5b2089 100644
--- a/mail/postfix-current/pkg-install
+++ b/mail/postfix-current/pkg-install
@@ -81,6 +81,20 @@ if [ x"$2" = xPRE-INSTALL ]; then
             exit 1
         fi
     fi
+
+    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
+        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
+    else
+        echo "You need user \"${USER}\" added to group \"mail\"."
+        if yesno "Would you like me to add it" y; then
+            /usr/sbin/pw groupmod mail -m ${USER} || exit
+            echo "Done."
+        else
+            echo "Please create it, and try again."
+            exit 1
+        fi
+    fi
+
 fi
 
 if [ x"$2" = xPOST-INSTALL ]; then
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index 4b13bd60ce29..d77a712b23a5 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -20,8 +20,8 @@ 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 (currently broken)" OFF \
-IPv6		"IPv6 support (not KAME official)" OFF \
+TLS		"SSL and TLS" OFF \
+IPv6		"IPv6 support (currently broken)" OFF \
 2> $tempfile
 
 	retval=$?
@@ -82,8 +82,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.8.7-1.1.7-0.9.6c.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-20020613-0.9.6d.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-20020613-0.9.6d/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -131,7 +131,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.cyber-magic.org/~taka/misc/"
-			echo "PATCHFILES+=	postfix-1.1.9+ipv6.patch.gz"
+			echo "PATCHFILES+=	postfix-1.1.10+ipv6.patch.gz"
 			echo "PATCH_DIST_STRIP= -p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""