Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Oct 2016 14:53:55 +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: r423975 - head/net/wireshark
Message-ID:  <201610141453.u9EErtJI039018@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marcus
Date: Fri Oct 14 14:53:55 2016
New Revision: 423975
URL: https://svnweb.freebsd.org/changeset/ports/423975

Log:
  I had updated to 2.2.0 locally and for some reason never committed it.
  
  Update to 2.2.0.  This will be shortly followed by 2.2.1.

Modified:
  head/net/wireshark/Makefile
  head/net/wireshark/distinfo
  head/net/wireshark/pkg-plist

Modified: head/net/wireshark/Makefile
==============================================================================
--- head/net/wireshark/Makefile	Fri Oct 14 14:40:46 2016	(r423974)
+++ head/net/wireshark/Makefile	Fri Oct 14 14:53:55 2016	(r423975)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	wireshark
-PORTVERSION=	2.0.5
+PORTVERSION=	2.2.0
 PORTREVISION?=	0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
@@ -27,7 +27,7 @@ DATADIR_NAME=	wireshark
 DATADIR=	${PREFIX}/share/${DATADIR_NAME}
 
 GNU_CONFIGURE=	yes
-USES=		alias cpe gmake libtool perl5 pkgconfig python:build ssl tar:bzip2
+USES=		alias cpe gmake libtool pathfix perl5 pkgconfig python:build ssl tar:bzip2
 USE_PERL5=	build
 USE_GNOME=	glib20
 CONFIGURE_ARGS+=	--program-transform-name="" \
@@ -40,7 +40,7 @@ LIBS+=		-L${LOCALBASE}/lib
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
-    reordercap captype androiddump
+    reordercap captype androiddump randpktdump
 .if defined(LITE)
 PKGNAMESUFFIX=		-lite
 PLIST_SUB+=		${x:tu}="@comment $x not installed" \
@@ -49,7 +49,8 @@ CONFIGURE_ARGS+=	--enable-$x=no
 OPTIONS_EXCLUDE+=	RTP SNMP GEOIP LUA ADNS CARES
 .else
 PLIST_SUB+=		${x:tu}=bin/$x \
-			${x:tu}_MAN=""
+			${x:tu}_MAN="" \
+			${x:tu}_LIB=""
 .endif
 .endfor
 

Modified: head/net/wireshark/distinfo
==============================================================================
--- head/net/wireshark/distinfo	Fri Oct 14 14:40:46 2016	(r423974)
+++ head/net/wireshark/distinfo	Fri Oct 14 14:53:55 2016	(r423975)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470427617
-SHA256 (wireshark-2.0.5.tar.bz2) = 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b
-SIZE (wireshark-2.0.5.tar.bz2) = 31124989
+TIMESTAMP = 1473707149
+SHA256 (wireshark-2.2.0.tar.bz2) = a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104
+SIZE (wireshark-2.2.0.tar.bz2) = 32141141

Modified: head/net/wireshark/pkg-plist
==============================================================================
--- head/net/wireshark/pkg-plist	Fri Oct 14 14:40:46 2016	(r423974)
+++ head/net/wireshark/pkg-plist	Fri Oct 14 14:53:55 2016	(r423975)
@@ -1,4 +1,3 @@
-%%ANDROIDDUMP%%
 %%CAPINFOS%%
 %%CAPTYPE%%
 %%DFTEST%%
@@ -17,14 +16,19 @@ bin/idl2wrs
 bin/tshark
 %%TEXT2PCAP%%
 lib/libwireshark.so
-lib/libwireshark.so.6
-lib/libwireshark.so.6.1.5
+lib/libwireshark.so.8
+lib/libwireshark.so.8.0.0
 lib/libwiretap.so
-lib/libwiretap.so.5
-lib/libwiretap.so.5.0.5
+lib/libwiretap.so.6
+lib/libwiretap.so.6.0.0
+lib/libwscodecs.so
+lib/libwscodecs.so.1
+lib/libwscodecs.so.1.0.0
 lib/libwsutil.so
-lib/libwsutil.so.6
-lib/libwsutil.so.6.0.0
+lib/libwsutil.so.7
+lib/libwsutil.so.7.0.0
+%%ANDROIDDUMP_LIB%%lib/wireshark/extcap/androiddump
+%%RANDPKTDUMP_LIB%%lib/wireshark/extcap/randpktdump
 lib/wireshark/plugins/%%PORTVERSION%%/docsis.so
 lib/wireshark/plugins/%%PORTVERSION%%/ethercat.so
 lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so
@@ -38,6 +42,7 @@ lib/wireshark/plugins/%%PORTVERSION%%/un
 lib/wireshark/plugins/%%PORTVERSION%%/wimax.so
 lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
 lib/wireshark/plugins/%%PORTVERSION%%/wimaxmacphy.so
+libdata/pkgconfig/wireshark.pc
 %%ANDROIDDUMP_MAN%%man/man1/androiddump.1.gz
 %%CAPINFOS_MAN%%man/man1/capinfos.1.gz
 man/man1/dumpcap.1.gz
@@ -47,9 +52,11 @@ man/man1/dumpcap.1.gz
 %%TEXT2PCAP_MAN%%man/man1/text2pcap.1.gz
 %%DFTEST_MAN%%man/man1/dftest.1.gz
 %%RANDPKT_MAN%%man/man1/randpkt.1.gz
+%%RANDPKTDUMP_MAN%%man/man1/randpktdump.1.gz
 %%REORDERCAP_MAN%%man/man1/reordercap.1.gz
 man/man1/tshark.1.gz
 %%GUI%%man/man1/wireshark.1.gz
+man/man4/extcap.4.gz
 man/man4/wireshark-filter.4.gz
 %%GUI%%share/appdata/wireshark.appdata.xml
 %%GUI%%share/applications/wireshark.desktop
@@ -75,6 +82,7 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/androiddump.html
 %%DATADIR%%/capinfos.html
 %%DATADIR%%/cfilters
+%%DATADIR%%/ciscodump.html
 %%DATADIR%%/colorfilters
 %%LUA%%%%DATADIR%%/console.lua
 %%DATADIR%%/dfilters
@@ -83,6 +91,7 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/dumpcap.html
 %%DATADIR%%/diameter/AlcatelLucent.xml
 %%DATADIR%%/diameter/Cisco.xml
+%%DATADIR%%/diameter/CiscoSystems.xml
 %%DATADIR%%/diameter/Custom.xml
 %%DATADIR%%/diameter/Ericsson.xml
 %%DATADIR%%/diameter/HP.xml
@@ -116,6 +125,7 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/dtds/xcap-caps.dtd
 %%DATADIR%%/dtds/xcap-error.dtd
 %%DATADIR%%/editcap.html
+%%DATADIR%%/extcap.html
 %%LUA%%%%DATADIR%%/init.lua
 %%DATADIR%%/help/capture_filters.txt
 %%DATADIR%%/help/capturing.txt
@@ -290,6 +300,7 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/radius/dictionary.roaringpenguin
 %%DATADIR%%/radius/dictionary.ruckus
 %%DATADIR%%/radius/dictionary.ruggedcom
+%%DATADIR%%/radius/dictionary.sangoma
 %%DATADIR%%/radius/dictionary.sg
 %%DATADIR%%/radius/dictionary.shasta
 %%DATADIR%%/radius/dictionary.shiva
@@ -330,9 +341,11 @@ man/man4/wireshark-filter.4.gz
 %%DATADIR%%/radius/dictionary.zte
 %%DATADIR%%/radius/dictionary.zyxel
 %%DATADIR%%/randpkt.html
+%%DATADIR%%/randpktdump.html
 %%DATADIR%%/rawshark.html
 %%DATADIR%%/reordercap.html
 %%DATADIR%%/services
+%%DATADIR%%/sshdump.html
 %%DATADIR%%/smi_modules
 %%DATADIR%%/tshark.html
 %%DATADIR%%/text2pcap.html



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610141453.u9EErtJI039018>