From owner-svn-ports-head@FreeBSD.ORG  Sat Jan 31 16:58:26 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7F1BEE6;
 Sat, 31 Jan 2015 16:58:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6B5931AE;
 Sat, 31 Jan 2015 16:58:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0VGwQag077464;
 Sat, 31 Jan 2015 16:58:26 GMT (envelope-from ohauer@FreeBSD.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0VGwQia077463;
 Sat, 31 Jan 2015 16:58:26 GMT (envelope-from ohauer@FreeBSD.org)
Message-Id: <201501311658.t0VGwQia077463@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ohauer set sender to
 ohauer@FreeBSD.org using -f
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sat, 31 Jan 2015 16:58:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r378222 - head/mail/postfix-tls
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Jan 2015 16:58:26 -0000

Author: ohauer
Date: Sat Jan 31 16:58:25 2015
New Revision: 378222
URL: https://svnweb.freebsd.org/changeset/ports/378222
QAT: https://qat.redports.org/buildarchive/r378222/

Log:
  - update conflicts

Modified:
  head/mail/postfix-tls/Makefile

Modified: head/mail/postfix-tls/Makefile
==============================================================================
--- head/mail/postfix-tls/Makefile	Sat Jan 31 16:57:44 2015	(r378221)
+++ head/mail/postfix-tls/Makefile	Sat Jan 31 16:58:25 2015	(r378222)
@@ -3,10 +3,10 @@
 
 PKGNAMESUFFIX=	-tls
 
-CONFLICTS_INSTALL=	courier-0.* postfix-1.* postfix2?-* postfix21?-* \
-			postfix-current-2.* postfix-current-base-2.* sendmail-8.* \
-			sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]* \
-			postfix-2.*
+CONFLICTS_INSTALL=	courier-0.* postfix2?-* postfix21?-* postfix-2.* \
+			postfix-current-[23].* postfix-current-base-[23].* \
+			sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* \
+			opensmtpd-[0-9]*
 
 OPTIONS_SLAVE=	TLS