diff options
| -rw-r--r-- | net/tshark-lite/Makefile | 4 | ||||
| -rw-r--r-- | net/tshark/Makefile | 3 | ||||
| -rw-r--r-- | net/wireshark-lite/Makefile | 2 | ||||
| -rw-r--r-- | net/wireshark/Makefile | 6 | ||||
| -rw-r--r-- | net/wireshark/pkg-plist | 6 |
5 files changed, 17 insertions, 4 deletions
diff --git a/net/tshark-lite/Makefile b/net/tshark-lite/Makefile index b341e6bfd03a..1d8ed57d2196 100644 --- a/net/tshark-lite/Makefile +++ b/net/tshark-lite/Makefile @@ -1,8 +1,12 @@ # Created by: Bill Fumerola <billf@mu.org> # $FreeBSD$ +PORTREVISION= 1 + LITE= yes +CONFLICTS_INSTALL?= tshark-[0-9]* wireshark-[0-9]* wireshark-lite-[0-9]* + MASTERDIR= ${.CURDIR}/../tshark COMMENT= Powerful network analyzer/capture tool (lite package) 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 diff --git a/net/wireshark-lite/Makefile b/net/wireshark-lite/Makefile index 860765679df6..a568f4248852 100644 --- a/net/wireshark-lite/Makefile +++ b/net/wireshark-lite/Makefile @@ -3,6 +3,8 @@ LITE= yes +CONFLICTS_INSTALL?= wireshark-[0-9]* tshark-[0-9]* tshark-lite-[0-9]* + MASTERDIR= ${.CURDIR}/../wireshark COMMENT= Powerful network analyzer/capture tool (lite package) diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 8928e3d03257..9396823b94f6 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -21,11 +21,13 @@ COMMENT?= Powerful network analyzer/capture tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS_INSTALL?= wireshark-lite-[0-9]* tshark-[0-9]* tshark-lite-[0-9]* + DATADIR_NAME= wireshark DATADIR= ${PREFIX}/share/${DATADIR_NAME} USES= alias cmake cpe compiler:c++11-lang gettext-runtime \ - libtool localbase pathfix \ + libtool localbase pathfix localbase:ldflags \ perl5 pkgconfig python:3.4+ ssl tar:xz USE_PERL5= build USE_GNOME= glib20 libxml2 @@ -187,5 +189,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/share/applications|${DESKTOPDIR}|g ; \ s|/usr/share|${LOCALBASE}/share|g' \ ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|lua$${LUA_INC_SUFFIX}|lua-${LUA_VER}|g' \ + ${WRKSRC}/cmake/modules/FindLUA.cmake .include <bsd.port.mk> diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index 5bb2e9c80b11..7070c8e01338 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -609,9 +609,9 @@ lib/libwireshark.so.12.0.0 lib/libwiretap.so lib/libwiretap.so.9 lib/libwiretap.so.9.0.0 -%%GUI%%lib/libwscodecs.so -%%GUI%%lib/libwscodecs.so.2 -%%GUI%%lib/libwscodecs.so.2.0.0 +lib/libwscodecs.so +lib/libwscodecs.so.2 +lib/libwscodecs.so.2.0.0 lib/libwsutil.so lib/libwsutil.so.10 lib/libwsutil.so.10.0.0 |