- update to 3.2-20160314

- change comment to reflect this is a  Experimental version
- fix CONFLICTS

Changes:
20160227
	Cleanup: remember multiple BCC actions in access maps.
	Files: smtpd/smtpd.h, smtpd/smtpd.c, smtpd/smtpd_check.c,
	smtpd/smtpd_state.c, proto/access.

20160228
	Documentation: STRESS_README. File: proto/STRESS_README.html.

20160229
	Documentation: postmulti manpage. File: postmulti/postmulti.c.

20160305
	Future-proofing: detect integer overflow before it happens.
	After-the-fact detection relies on assumptions about
	undefined behavior that are invalidated by compilers.  Files:
	util/mymalloc.c, util/vstring.c.

20160310
	Bugfix (introduced: Postfix 2.6): the Milter SMFIR_CHGFROM
	(replace sender) request lost the sender_bcc_maps address.
	Fixed by moving some record keeping to the sender output function.
	Files: cleanup/cleanup_envelope.c, cleanup/cleanuop_addr.c,
	cleanup/cleanup_milter.c, cleanup/cleanup.h, regression tests.

20160314
	Future-proofing: detect integer overflow before it happens.
	After-the-fact detection relies on assumptions about
	undefined behavior that are invalidated by compilers. Files:
	global/off_cvt.c.

	Cleanup: include <sys/types.h> once, instead of making it
	system-dependent. File: util/sys_defs.h.

	Cleanup: make sorting in "make depend" locale-independent.
	Files: */Makefile.in.

1 files changed, 4 insertions, 4 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index bb839efb6852..da465bf15dec 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-DISTVERSION=	3.2-20160224
+DISTVERSION=	3.2-20160314
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -16,7 +16,7 @@ PKGNAMESUFFIX?=	-current
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ohauer@FreeBSD.org
-COMMENT=	Secure alternative to widely-used Sendmail
+COMMENT=	Experimental Postfix version
 
 LICENSE=	IPL10
 LICENSE_NAME=	IBM PUBLIC LICENSE VERSION 1.0
@@ -26,8 +26,8 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
 
 CONFLICTS_INSTALL?=	courier-0.* opensmtpd-[0-9]* \
-		sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* \
-		postfix-2.* postfix-base-2.* postfix21?-*
+		sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* postfix211-* \
+		postfix-[2|3].* postfix-base-[2|3].* postfix-sasl-[2|3].*
 
 USERS=		postfix
 GROUPS=		mail maildrop postfix