Date: Wed, 13 Mar 2019 20:47:19 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495662 - in head/net: tshark tshark-lite wireshark wireshark-lite Message-ID: <201903132047.x2DKlJMH051396@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Wed Mar 13 20:47:18 2019 New Revision: 495662 URL: https://svnweb.freebsd.org/changeset/ports/495662 Log: Various fixes. * Fix detection of the LUA library * Unconditionally package libwscodecs * Add CONFLICTS_INSTALL throughout PR: 236332 (for LUA) 236468 (for conflicts) Modified: head/net/tshark-lite/Makefile head/net/tshark/Makefile head/net/wireshark-lite/Makefile head/net/wireshark/Makefile head/net/wireshark/pkg-plist Modified: head/net/tshark-lite/Makefile ============================================================================== --- head/net/tshark-lite/Makefile Wed Mar 13 20:42:21 2019 (r495661) +++ head/net/tshark-lite/Makefile Wed Mar 13 20:47:18 2019 (r495662) @@ -1,7 +1,11 @@ # 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) Modified: head/net/tshark/Makefile ============================================================================== --- head/net/tshark/Makefile Wed Mar 13 20:42:21 2019 (r495661) +++ head/net/tshark/Makefile Wed Mar 13 20:47:18 2019 (r495662) @@ -2,7 +2,10 @@ # $FreeBSD$ PORTNAME= tshark +PORTREVISION= 1 CATEGORIES= net ipv6 + +CONFLICTS_INSTALL?= tshark-lite-[0-9]* wireshark-lite-[0-9]* wireshark-[0-9]* MASTERDIR= ${.CURDIR}/../wireshark Modified: head/net/wireshark-lite/Makefile ============================================================================== --- head/net/wireshark-lite/Makefile Wed Mar 13 20:42:21 2019 (r495661) +++ head/net/wireshark-lite/Makefile Wed Mar 13 20:47:18 2019 (r495662) @@ -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) Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Wed Mar 13 20:42:21 2019 (r495661) +++ head/net/wireshark/Makefile Wed Mar 13 20:47:18 2019 (r495662) @@ -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> Modified: head/net/wireshark/pkg-plist ============================================================================== --- head/net/wireshark/pkg-plist Wed Mar 13 20:42:21 2019 (r495661) +++ head/net/wireshark/pkg-plist Wed Mar 13 20:47:18 2019 (r495662) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903132047.x2DKlJMH051396>