From owner-svn-ports-all@freebsd.org  Mon Dec  4 16:59:21 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 7A728E5D8C1;
 Mon,  4 Dec 2017 16:59:21 +0000 (UTC)
 (envelope-from asomers@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 2C97A6FCEA;
 Mon,  4 Dec 2017 16:59:21 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB4GxK4t096162;
 Mon, 4 Dec 2017 16:59:20 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB4GxKQg096160;
 Mon, 4 Dec 2017 16:59:20 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201712041659.vB4GxKQg096160@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Mon, 4 Dec 2017 16:59:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r455527 - in head: comms/mlan3 shells/fish
X-SVN-Group: ports-head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in head: comms/mlan3 shells/fish
X-SVN-Commit-Revision: 455527
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.25
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: Mon, 04 Dec 2017 16:59:21 -0000

Author: asomers (src committer)
Date: Mon Dec  4 16:59:19 2017
New Revision: 455527
URL: https://svnweb.freebsd.org/changeset/ports/455527

Log:
  comms/mlan3 shells/fish: annotate conflicts
  
  They both install /usr/local/bin/fish
  
  PR:		222777
  Reported by:	http://pkgtool.osorio.me/conflicts/
  Approved by:	Chris Hutchinson <portmaster@bsdforge.com> (mlan3 maintainer)
  Differential Revision:	https://reviews.freebsd.org/D13318

Modified:
  head/comms/mlan3/Makefile
  head/shells/fish/Makefile

Modified: head/comms/mlan3/Makefile
==============================================================================
--- head/comms/mlan3/Makefile	Mon Dec  4 16:57:35 2017	(r455526)
+++ head/comms/mlan3/Makefile	Mon Dec  4 16:59:19 2017	(r455527)
@@ -17,6 +17,8 @@ NO_WRKSUBDIR=	yes
 USES=		dos2unix uidfix zip
 DOS2UNIX_GLOB=	*.c *.h
 
+CONFLICTS_INSTALL=	shells/fish
+
 post-patch:
 	@${REINPLACE_CMD} -e '/int main/s/short argc/int argc/' \
 		${WRKSRC}/apps/gethumd/gethumd.c ${WRKSRC}/apps/shaapp/shaapp.c

Modified: head/shells/fish/Makefile
==============================================================================
--- head/shells/fish/Makefile	Mon Dec  4 16:57:35 2017	(r455526)
+++ head/shells/fish/Makefile	Mon Dec  4 16:59:19 2017	(r455527)
@@ -17,6 +17,8 @@ USES=		autoreconf cpe gmake libtool ncurses pkgconfig 
 		localbase compiler:c++11-lang shebangfix
 SHEBANG_FILES=	share/tools/*.py share/tools/web_config/webconfig.py
 
+CONFLICTS_INSTALL=	comms/mlan3
+
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	fishshell