Attachment 163218 Details for Bug 204411 – Patch2.diff

[patch] Patch2.diff

patch-tshark.diff (text/plain), 2.54 KB, created by Andriy Voskoboinyk on 2015-11-17 01:51:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-11-17 01:51:28 UTC

Size: 2.54 KB

patch

obsolete

>Index: net/tshark/Makefile
>===================================================================
>--- net/tshark/Makefile	(revision 401790)
>+++ net/tshark/Makefile	(working copy)
>@@ -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"
>Index: net/tshark-lite/Makefile
>===================================================================
>--- net/tshark-lite/Makefile	(revision 401790)
>+++ net/tshark-lite/Makefile	(working copy)
>@@ -2,7 +2,6 @@
> # $FreeBSD$
> 
> LITE=		yes
>-PKGNAMESUFFIX=	-lite
> 
> MASTERDIR=	${.CURDIR}/../tshark
> COMMENT=	Powerful network analyzer/capture tool (lite package)
>Index: net/wireshark/Makefile
>===================================================================
>--- net/wireshark/Makefile	(revision 401790)
>+++ net/wireshark/Makefile	(working copy)
>@@ -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 @@
> 		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 @@
> 
> 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 @@
> .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=""
>Index: net/wireshark-lite/Makefile
>===================================================================
>--- net/wireshark-lite/Makefile	(revision 401790)
>+++ net/wireshark-lite/Makefile	(working copy)
>@@ -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"

Actions: View | Diff

Attachments on bug 204411: 162942 | 162943 | 162944 | 162945 | 162946 | 162991 | 163218 | 163219 | 163220 | 163221 | 163222 | 163223 | 163224