diff options
| author | Alan Somers <asomers@FreeBSD.org> | 2017-12-04 16:59:19 +0000 |
|---|---|---|
| committer | Alan Somers <asomers@FreeBSD.org> | 2017-12-04 16:59:19 +0000 |
| commit | 0b54608fa9e25d309b611c6c882d8ec04d3f83b9 (patch) | |
| tree | 6a074f88894a648b6a2969ca8b74a8b90d92ead8 /comms/mlan3/Makefile | |
| parent | 3722159e8e101fc1904e7b2d5eb0a4830e0c02fb (diff) | |
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
Notes
Notes:
svn path=/head/; revision=455527
Diffstat (limited to 'comms/mlan3/Makefile')
| -rw-r--r-- | comms/mlan3/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/comms/mlan3/Makefile b/comms/mlan3/Makefile index 3cb86ecad1be..5dd3b76cbb22 100644 --- a/comms/mlan3/Makefile +++ b/comms/mlan3/Makefile @@ -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 |