svn commit: r455527 - in head: comms/mlan3 shells/fish

[Alan Somers]

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 at 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