Date: Tue, 17 Nov 2015 17:35:31 +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: r401821 - in head/net: tshark tshark-lite wireshark wireshark-lite Message-ID: <201511171735.tAHHZVm9099924@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Tue Nov 17 17:35:31 2015 New Revision: 401821 URL: https://svnweb.freebsd.org/changeset/ports/401821 Log: Refactor tshark and the lite ports to fix the build. Submitted by: Andriy Voskoboinyk <s3erios@gmail.com> Modified: head/net/tshark-lite/Makefile head/net/tshark/Makefile head/net/wireshark-lite/Makefile head/net/wireshark/Makefile Modified: head/net/tshark-lite/Makefile ============================================================================== --- head/net/tshark-lite/Makefile Tue Nov 17 16:52:26 2015 (r401820) +++ head/net/tshark-lite/Makefile Tue Nov 17 17:35:31 2015 (r401821) @@ -2,7 +2,6 @@ # $FreeBSD$ LITE= yes -PKGNAMESUFFIX= -lite MASTERDIR= ${.CURDIR}/../tshark COMMENT= Powerful network analyzer/capture tool (lite package) Modified: head/net/tshark/Makefile ============================================================================== --- head/net/tshark/Makefile Tue Nov 17 16:52:26 2015 (r401820) +++ head/net/tshark/Makefile Tue Nov 17 17:35:31 2015 (r401821) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= tshark -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTERDIR= ${.CURDIR}/../wireshark -OPTIONS_EXCLUDE= X11 GTK3 QT5 +OPTIONS_EXCLUDE= GTK2 GTK3 QT5 .include "${MASTERDIR}/Makefile" Modified: head/net/wireshark-lite/Makefile ============================================================================== --- head/net/wireshark-lite/Makefile Tue Nov 17 16:52:26 2015 (r401820) +++ head/net/wireshark-lite/Makefile Tue Nov 17 17:35:31 2015 (r401821) @@ -2,11 +2,8 @@ # $FreeBSD$ LITE= yes -PKGNAMESUFFIX= -lite MASTERDIR= ${.CURDIR}/../wireshark COMMENT= Powerful network analyzer/capture tool (lite package) -OPTIONS_EXCLUDE= LUA RTP SNMP ADNS CARES GEOIP - .include "${MASTERDIR}/Makefile" Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Tue Nov 17 16:52:26 2015 (r401820) +++ head/net/wireshark/Makefile Tue Nov 17 17:35:31 2015 (r401821) @@ -3,7 +3,7 @@ PORTNAME?= wireshark PORTVERSION= 1.12.8 -PORTREVISION= 1 +PORTREVISION?= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ @@ -13,6 +13,7 @@ MASTER_SITES= http://www.wireshark.org/d http://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ ftp://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ http://wireshark.zing.org/download/src/ +DISTNAME= ${DATADIR_NAME}-${PORTVERSION} MAINTAINER= marcus@FreeBSD.org COMMENT?= Powerful network analyzer/capture tool @@ -22,6 +23,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS?= wireshark-qt5-[0-9]* +DATADIR_NAME= wireshark +DATADIR= ${PREFIX}/share/${DATADIR_NAME} + GNU_CONFIGURE= yes USES= alias cpe gmake libtool perl5 pkgconfig python:build tar:bzip2 USE_PERL5= build @@ -39,9 +43,11 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ reordercap captype .if defined(LITE) +PKGNAMESUFFIX= -lite PLIST_SUB+= ${x:tu}="@comment $x not installed" \ ${x:tu}_MAN="@comment $x not installed " CONFIGURE_ARGS+= --enable-$x=no +OPTIONS_EXCLUDE+= RTP SNMP GEOIP LUA ADNS CARES .else PLIST_SUB+= ${x:tu}=bin/$x \ ${x:tu}_MAN=""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511171735.tAHHZVm9099924>