From owner-svn-ports-all@freebsd.org  Thu Oct  5 01:55:53 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 BDA96E27B62;
 Thu,  5 Oct 2017 01:55:53 +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 8DE637EABC;
 Thu,  5 Oct 2017 01:55:53 +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 v951tq5Y073324;
 Thu, 5 Oct 2017 01:55:52 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v951tq25073323;
 Thu, 5 Oct 2017 01:55:52 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201710050155.v951tq25073323@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:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451261 - 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: 451261
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Oct 2017 01:55:53 -0000

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

Log:
  Register a conflict with bsdrcmds when the r command rename options
  are not selected.
  
  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:40 2017	(r451260)
+++ head/security/krb5-appl/Makefile	Thu Oct  5 01:55:52 2017	(r451261)
@@ -103,6 +103,12 @@ PLIST_SUB+=		RCP_PROG="krcp"
 PLIST_SUB+=		RCP_PROG="rcp"
 .endif
 
+.if ! ( ${PORT_OPTIONS:MKRB5_RENAME_RLOGIN} && \
+	${PORT_OPTIONS:MKRB5_RENAME_RSH} && \
+	${PORT_OPTIONS:MKRB5_RENAME_RCP} )
+CONFLICTS+=	bsdrcmds-*
+.endif
+
 .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != ""
 CONFIGURE_ARGS+=	--program-transform-name="${PROGRAM_TRANSFORM_NAME}"
 .endif