From owner-svn-ports-head@freebsd.org  Sat Oct 14 19:43:38 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 448ABE2B0FC;
 Sat, 14 Oct 2017 19:43:38 +0000 (UTC)
 (envelope-from thierry@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 139147E55E;
 Sat, 14 Oct 2017 19:43:38 +0000 (UTC)
 (envelope-from thierry@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9EJhbr0077116;
 Sat, 14 Oct 2017 19:43:37 GMT (envelope-from thierry@FreeBSD.org)
Received: (from thierry@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9EJhbAG077115;
 Sat, 14 Oct 2017 19:43:37 GMT (envelope-from thierry@FreeBSD.org)
Message-Id: <201710141943.v9EJhbAG077115@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: thierry set sender to
 thierry@FreeBSD.org using -f
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Sat, 14 Oct 2017 19:43:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r452085 - head/mail/panda-imap
X-SVN-Group: ports-head
X-SVN-Commit-Author: thierry
X-SVN-Commit-Paths: head/mail/panda-imap
X-SVN-Commit-Revision: 452085
X-SVN-Commit-Repository: ports
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Oct 2017 19:43:38 -0000

Author: thierry
Date: Sat Oct 14 19:43:37 2017
New Revision: 452085
URL: https://svnweb.freebsd.org/changeset/ports/452085

Log:
  Register a CONFLICTS with mail/courier.
  
  PR:		223011
  Reported by:	FreeBSD Ports Conflicts Scanner

Modified:
  head/mail/panda-imap/Makefile

Modified: head/mail/panda-imap/Makefile
==============================================================================
--- head/mail/panda-imap/Makefile	Sat Oct 14 19:30:20 2017	(r452084)
+++ head/mail/panda-imap/Makefile	Sat Oct 14 19:43:37 2017	(r452085)
@@ -18,7 +18,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	jonabbey
 GH_TAGNAME=	7905901
 
-CONFLICTS_INSTALL=	imap-uw-20*
+CONFLICTS_INSTALL=	imap-uw-20* courier-0.65.*
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 SUB_FILES=	pkg-message