diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2019-03-13 20:47:18 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2019-03-13 20:47:18 +0000 |
| commit | 1bd6e9b7b601771f1634ee74d5d41d95d1ecb509 (patch) | |
| tree | 34d735fb4af7d9c19c245efb62c993af89b81fdf /net/tshark | |
| parent | multimedia/vapoursynth-l-smash-works: back out r495563 per r494758 (diff) | |
Various fixes.
* Fix detection of the LUA library
* Unconditionally package libwscodecs
* Add CONFLICTS_INSTALL throughout
PR: 236332 (for LUA)
236468 (for conflicts)
Notes
Notes:
svn path=/head/; revision=495662
Diffstat (limited to 'net/tshark')
| -rw-r--r-- | net/tshark/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/tshark/Makefile b/net/tshark/Makefile index 843f5501f9a5..99c2257b144d 100644 --- a/net/tshark/Makefile +++ b/net/tshark/Makefile @@ -2,8 +2,11 @@ # $FreeBSD$ PORTNAME= tshark +PORTREVISION= 1 CATEGORIES= net ipv6 +CONFLICTS_INSTALL?= tshark-lite-[0-9]* wireshark-lite-[0-9]* wireshark-[0-9]* + MASTERDIR= ${.CURDIR}/../wireshark OPTIONS_EXCLUDE= GUI |