From owner-svn-ports-head@freebsd.org Wed Mar 13 20:47:20 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A8A91541C3A; Wed, 13 Mar 2019 20:47:20 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 402E070090; Wed, 13 Mar 2019 20:47:20 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31D6AFE75; Wed, 13 Mar 2019 20:47:20 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2DKlKa3051401; Wed, 13 Mar 2019 20:47:20 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2DKlJMH051396; Wed, 13 Mar 2019 20:47:19 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201903132047.x2DKlJMH051396@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Wed, 13 Mar 2019 20:47:19 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: marcus X-SVN-Commit-Paths: in head/net: tshark tshark-lite wireshark wireshark-lite X-SVN-Commit-Revision: 495662 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 402E070090 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Mar 2019 20:47:20 -0000 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 # $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 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