Attachment #163218 for bug #204411

Lines 2-12 Link Here

(-)net/tshark/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tshark	4	PORTNAME= tshark
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= net ipv6	6	CATEGORIES= net ipv6
7		7
8	MASTERDIR= ${.CURDIR}/../wireshark	8	MASTERDIR= ${.CURDIR}/../wireshark
9		9
10	OPTIONS_EXCLUDE= X11 GTK3 QT5	10	OPTIONS_EXCLUDE= GTK2 GTK3 QT5
11		11
12	.include "${MASTERDIR}/Makefile"	12	.include "${MASTERDIR}/Makefile"

Lines 2-8 Link Here

(-)net/tshark-lite/Makefile (-1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	LITE= yes	4	LITE= yes
5	PKGNAMESUFFIX= -lite
6		5
7	MASTERDIR= ${.CURDIR}/../tshark	6	MASTERDIR= ${.CURDIR}/../tshark
8	COMMENT= Powerful network analyzer/capture tool (lite package)	7	COMMENT= Powerful network analyzer/capture tool (lite package)

Lines 3-9 Link Here

(-)net/wireshark/Makefile (-1 / +7 lines)
3		3
4	PORTNAME?= wireshark	4	PORTNAME?= wireshark
5	PORTVERSION= 1.12.8	5	PORTVERSION= 1.12.8
6	PORTREVISION= 1	6	PORTREVISION?= 1
7	CATEGORIES= net ipv6	7	CATEGORIES= net ipv6
8	MASTER_SITES= http://www.wireshark.org/download/src/ \	8	MASTER_SITES= http://www.wireshark.org/download/src/ \
9	http://ftp.uni-kl.de/pub/wireshark/src/ \	9	http://ftp.uni-kl.de/pub/wireshark/src/ \
Lines 13-18 Link Here
13	http://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \	13	http://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \
14	ftp://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \	14	ftp://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \
15	http://wireshark.zing.org/download/src/	15	http://wireshark.zing.org/download/src/
		16	DISTNAME= ${DATADIR_NAME}-${PORTVERSION}
16		17
17	MAINTAINER= marcus@FreeBSD.org	18	MAINTAINER= marcus@FreeBSD.org
18	COMMENT?= Powerful network analyzer/capture tool	19	COMMENT?= Powerful network analyzer/capture tool
Lines 22-27 Link Here
22		23
23	CONFLICTS?= wireshark-qt5-[0-9]*	24	CONFLICTS?= wireshark-qt5-[0-9]*
24		25
		26	DATADIR_NAME= wireshark
		27	DATADIR= ${PREFIX}/share/${DATADIR_NAME}
		28
25	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
26	USES= alias cpe gmake libtool perl5 pkgconfig python:build tar:bzip2	30	USES= alias cpe gmake libtool perl5 pkgconfig python:build tar:bzip2
27	USE_PERL5= build	31	USE_PERL5= build
Lines 39-47 Link Here
39	.for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \	43	.for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
40	reordercap captype	44	reordercap captype
41	.if defined(LITE)	45	.if defined(LITE)
		46	PKGNAMESUFFIX= -lite
42	PLIST_SUB+= ${x:tu}="@comment $x not installed" \	47	PLIST_SUB+= ${x:tu}="@comment $x not installed" \
43	${x:tu}_MAN="@comment $x not installed "	48	${x:tu}_MAN="@comment $x not installed "
44	CONFIGURE_ARGS+= --enable-$x=no	49	CONFIGURE_ARGS+= --enable-$x=no
		50	OPTIONS_EXCLUDE+= RTP SNMP GEOIP LUA ADNS CARES
45	.else	51	.else
46	PLIST_SUB+= ${x:tu}=bin/$x \	52	PLIST_SUB+= ${x:tu}=bin/$x \
47	${x:tu}_MAN=""	53	${x:tu}_MAN=""

Lines 2-12 Link Here

(-)net/wireshark-lite/Makefile (-3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	LITE= yes	4	LITE= yes
5	PKGNAMESUFFIX= -lite
6		5
7	MASTERDIR= ${.CURDIR}/../wireshark	6	MASTERDIR= ${.CURDIR}/../wireshark
8	COMMENT= Powerful network analyzer/capture tool (lite package)	7	COMMENT= Powerful network analyzer/capture tool (lite package)
9		8
10	OPTIONS_EXCLUDE= LUA RTP SNMP ADNS CARES GEOIP
11
12	.include "${MASTERDIR}/Makefile"	9	.include "${MASTERDIR}/Makefile"

Return to bug 204411