diff options
| author | asomers <asomers@FreeBSD.org> | 2017-12-05 00:59:19 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2018-02-04 06:04:19 +0800 |
| commit | 5f57df2ef2c6c067ddaa3a54bfa1d96a88104574 (patch) | |
| tree | 163268c05e14eaf3f82bebc89b856e9b05882787 /shells | |
| parent | 3dbd4d27b7ee00e2144db445cc1fa6f0c76eef1b (diff) | |
| download | freebsd-ports-gnome-5f57df2ef2c6c067ddaa3a54bfa1d96a88104574.tar.gz freebsd-ports-gnome-5f57df2ef2c6c067ddaa3a54bfa1d96a88104574.tar.zst freebsd-ports-gnome-5f57df2ef2c6c067ddaa3a54bfa1d96a88104574.zip | |
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
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/fish/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/shells/fish/Makefile b/shells/fish/Makefile index 04657c0636c1..2ae2c784b5af 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -17,6 +17,8 @@ USES= autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3.4+ \ 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 |