From owner-svn-ports-head@freebsd.org Tue Nov 17 17:35:33 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E00CA31764; Tue, 17 Nov 2015 17:35:33 +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 mx1.freebsd.org (Postfix) with ESMTPS id F04A51A0C; Tue, 17 Nov 2015 17:35:32 +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 tAHHZWgt099928; Tue, 17 Nov 2015 17:35:32 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAHHZVm9099924; Tue, 17 Nov 2015 17:35:31 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201511171735.tAHHZVm9099924@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Tue, 17 Nov 2015 17:35:31 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 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: Tue, 17 Nov 2015 17:35:33 -0000 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 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=""