5 files changed, 25 insertions, 10 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 26fb9d89fb4f..c894d272351f 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	1.1.10
+PORTVERSION=	1.1.11
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index a5c0d5513bba..439098303783 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,4 +1,4 @@
-MD5 (postfix/postfix-1.1.10.tar.gz) = 7041ed649b018346cd1a06074a87588d
-MD5 (postfix/pfixtls-0.8.9-1.1.9-0.9.6d.tar.gz) = e9052fd2f9a176a54facbad131442386
-MD5 (postfix/postfix-1.1.9+ipv6.patch.gz) = 6ac3b3e201d2d31d28542a3b5ad1d096
+MD5 (postfix/postfix-1.1.11.tar.gz) = b34bb2b5018327c19456a77814141208
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d
+MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
 MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix/pkg-install b/mail/postfix/pkg-install
index 5acdbac8d974..1ef1fb5b2089 100644
--- a/mail/postfix/pkg-install
+++ b/mail/postfix/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/pkg-message b/mail/postfix/pkg-message
index ba4a1f29f387..a7ae2b17e2a6 100644
--- a/mail/postfix/pkg-message
+++ b/mail/postfix/pkg-message
@@ -20,5 +20,6 @@ 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).
diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix
index fa708721283e..76c1729b0189 100644
--- a/mail/postfix/scripts/configure.postfix
+++ b/mail/postfix/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.22 2002-05-14 19:38:53 dwcjr Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.23 2002-06-20 01:32:20 dwcjr Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -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.9-1.1.9-0.9.6d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.9-1.1.9-0.9.6d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-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.11+ipv6.patch.gz"
 			echo "PATCH_DIST_STRIP= -p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""