From owner-svn-ports-head@freebsd.org  Thu Oct  5 01:55:41 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 C6B76E27B19;
 Thu,  5 Oct 2017 01:55:41 +0000 (UTC) (envelope-from cy@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 8FC3F7E9F1;
 Thu,  5 Oct 2017 01:55:41 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v951te5j073214;
 Thu, 5 Oct 2017 01:55:40 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v951teUu073213;
 Thu, 5 Oct 2017 01:55:40 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201710050155.v951teUu073213@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 5 Oct 2017 01:55:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451260 - head/security/krb5-appl
X-SVN-Group: ports-head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: head/security/krb5-appl
X-SVN-Commit-Revision: 451260
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: Thu, 05 Oct 2017 01:55:41 -0000

Author: cy
Date: Thu Oct  5 01:55:40 2017
New Revision: 451260
URL: https://svnweb.freebsd.org/changeset/ports/451260

Log:
  Register a conflict with bsdftpd-ssl.
  
  Reported by:	rodrigo

Modified:
  head/security/krb5-appl/Makefile   (contents, props changed)

Modified: head/security/krb5-appl/Makefile
==============================================================================
--- head/security/krb5-appl/Makefile	Thu Oct  5 01:55:26 2017	(r451259)
+++ head/security/krb5-appl/Makefile	Thu Oct  5 01:55:40 2017	(r451260)
@@ -16,7 +16,8 @@ COMMENT=		MIT implementation of RFC 4120 network authe
 
 BUILD_DEPENDS=		krb5-config:security/krb5
 
-CONFLICTS=		krb4-[0-9]* krb5-1.[0-7].* heimdal-[0-9]* srp-[0-9]*
+CONFLICTS=		krb4-[0-9]* krb5-1.[0-7].* heimdal-[0-9]* srp-[0-9]* \
+			bsdftpd-ssl-*
 
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USES=			autoreconf gmake ncurses perl5 gssapi:mit ssl