From owner-svn-ports-head@FreeBSD.ORG Sat Jun 8 22:16:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DCF7817F; Sat, 8 Jun 2013 22:16:59 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BE43C16D8; Sat, 8 Jun 2013 22:16:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r58MGxXA033742; Sat, 8 Jun 2013 22:16:59 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r58MGx2E033738; Sat, 8 Jun 2013 22:16:59 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <201306082216.r58MGx2E033738@svn.freebsd.org> From: Joe Marcus Clarke Date: Sat, 8 Jun 2013 22:16:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320299 - in head/net/wireshark: . files 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.14 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: Sat, 08 Jun 2013 22:16:59 -0000 Author: marcus Date: Sat Jun 8 22:16:58 2013 New Revision: 320299 URL: http://svnweb.freebsd.org/changeset/ports/320299 Log: Update to 1.10.0. Modified: head/net/wireshark/Makefile head/net/wireshark/distinfo head/net/wireshark/files/patch-epan_Makefile.in head/net/wireshark/pkg-plist Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Sat Jun 8 21:54:08 2013 (r320298) +++ head/net/wireshark/Makefile Sat Jun 8 22:16:58 2013 (r320299) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= wireshark -PORTVERSION= 1.8.7 +PORTVERSION= 1.10.0 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ @@ -41,7 +41,8 @@ DESKTOP_ENTRIES= "Wireshark" "Network Pr WIRESHARK_LIBS= -.for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt +.for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ + reordercap .if defined(LITE) PLIST_SUB+= ${x:U}="@comment $x not installed" CONFIGURE_ARGS+= --enable-$x=no Modified: head/net/wireshark/distinfo ============================================================================== --- head/net/wireshark/distinfo Sat Jun 8 21:54:08 2013 (r320298) +++ head/net/wireshark/distinfo Sat Jun 8 22:16:58 2013 (r320299) @@ -1,2 +1,2 @@ -SHA256 (wireshark-1.8.7.tar.bz2) = 5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842 -SIZE (wireshark-1.8.7.tar.bz2) = 24273700 +SHA256 (wireshark-1.10.0.tar.bz2) = 1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add +SIZE (wireshark-1.10.0.tar.bz2) = 27101631 Modified: head/net/wireshark/files/patch-epan_Makefile.in ============================================================================== --- head/net/wireshark/files/patch-epan_Makefile.in Sat Jun 8 21:54:08 2013 (r320298) +++ head/net/wireshark/files/patch-epan_Makefile.in Sat Jun 8 22:16:58 2013 (r320299) @@ -1,11 +1,10 @@ ---- epan/Makefile.in.orig 2010-08-29 18:19:28.000000000 -0400 -+++ epan/Makefile.in 2010-09-04 17:19:36.000000000 -0400 -@@ -746,6 +746,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$( - $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) \ - $(LIBGEOIP_CFLAGS) - +--- epan/Makefile.in.orig 2013-06-05 13:27:48.000000000 -0400 ++++ epan/Makefile.in 2013-06-08 17:55:04.000000000 -0400 +@@ -111,6 +111,7 @@ target_triplet = @target@ + DIST_COMMON = $(srcdir)/../Makefile.am.inc $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.common $(srcdir)/Makefile.in \ + $(srcdir)/doxygen.cfg.in +LIBS = @LUA_LIBS@ -+ - @HAVE_WARNINGS_AS_ERRORS_TRUE@AM_NON_GENERATED_CFLAGS = -Werror - - #Since code generated by lex may trigger gcc warnings, we are now generating two + @HAVE_WARNINGS_AS_ERRORS_TRUE@am__append_1 = -Werror + EXTRA_PROGRAMS = reassemble_test$(EXEEXT) + subdir = epan Modified: head/net/wireshark/pkg-plist ============================================================================== --- head/net/wireshark/pkg-plist Sat Jun 8 21:54:08 2013 (r320298) +++ head/net/wireshark/pkg-plist Sat Jun 8 22:16:58 2013 (r320299) @@ -6,17 +6,18 @@ bin/dumpcap %%MERGECAP%% %%RANDPKT%% %%RAWSHARK%% +%%REORDERCAP%% bin/tshark %%TEXT2PCAP%% lib/libwireshark.la lib/libwireshark.so -lib/libwireshark.so.2 +lib/libwireshark.so.3 lib/libwiretap.la lib/libwiretap.so lib/libwiretap.so.3 lib/libwsutil.la lib/libwsutil.so -lib/libwsutil.so.2 +lib/libwsutil.so.3 lib/wireshark/plugins/%%PORTVERSION%%/asn1.la lib/wireshark/plugins/%%PORTVERSION%%/asn1.so lib/wireshark/plugins/%%PORTVERSION%%/docsis.la @@ -43,6 +44,8 @@ lib/wireshark/plugins/%%PORTVERSION%%/wi lib/wireshark/plugins/%%PORTVERSION%%/wimax.so lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.la lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so +lib/wireshark/plugins/%%PORTVERSION%%/wimaxmacphy.la +lib/wireshark/plugins/%%PORTVERSION%%/wimaxmacphy.so %%DATADIR%%/AUTHORS-SHORT %%DATADIR%%/COPYING %%DATADIR%%/capinfos.html @@ -54,8 +57,12 @@ lib/wireshark/plugins/%%PORTVERSION%%/wi %%LUA%%%%DATADIR%%/dtd_gen.lua %%DATADIR%%/dumpcap.html %%DATADIR%%/diameter/AlcatelLucent.xml +%%DATADIR%%/diameter/ChinaTelecom.xml %%DATADIR%%/diameter/Cisco.xml %%DATADIR%%/diameter/Ericsson.xml +%%DATADIR%%/diameter/Nokia.xml +%%DATADIR%%/diameter/NokiaSiemensNetworks.xml +%%DATADIR%%/diameter/SKT.xml %%DATADIR%%/diameter/TGPPGmb.xml %%DATADIR%%/diameter/TGPPRx.xml %%DATADIR%%/diameter/TGPPS9.xml @@ -99,7 +106,10 @@ lib/wireshark/plugins/%%PORTVERSION%%/wi %%DATADIR%%/manuf %%DATADIR%%/mergecap.html %%DATADIR%%/pdml2html.xsl +%%DATADIR%%/profiles/Bluetooth/colorfilters +%%DATADIR%%/profiles/Classic/colorfilters %%DATADIR%%/radius/README.radius_dictionary +%%DATADIR%%/radius/custom.includes %%DATADIR%%/radius/dictionary %%DATADIR%%/radius/dictionary.3com %%DATADIR%%/radius/dictionary.3gpp @@ -208,9 +218,12 @@ lib/wireshark/plugins/%%PORTVERSION%%/wi %%DATADIR%%/radius/dictionary.rfc4849 %%DATADIR%%/radius/dictionary.rfc5090 %%DATADIR%%/radius/dictionary.rfc5176 +%%DATADIR%%/radius/dictionary.rfc5447 %%DATADIR%%/radius/dictionary.rfc5580 %%DATADIR%%/radius/dictionary.rfc5607 %%DATADIR%%/radius/dictionary.rfc5904 +%%DATADIR%%/radius/dictionary.rfc6519 +%%DATADIR%%/radius/dictionary.rfc6572 %%DATADIR%%/radius/dictionary.riverstone %%DATADIR%%/radius/dictionary.roaringpenguin %%DATADIR%%/radius/dictionary.shasta @@ -242,6 +255,7 @@ lib/wireshark/plugins/%%PORTVERSION%%/wi %%DATADIR%%/radius/dictionary.zyxel %%DATADIR%%/randpkt.html %%DATADIR%%/rawshark.html +%%DATADIR%%/reordercap.html %%DATADIR%%/services %%DATADIR%%/smi_modules %%DATADIR%%/tshark.html @@ -258,6 +272,9 @@ lib/wireshark/plugins/%%PORTVERSION%%/wi @dirrm %%DATADIR%%/wimaxasncp @dirrm %%DATADIR%%/tpncp @dirrm %%DATADIR%%/radius +@dirrm %%DATADIR%%/profiles/Classic +@dirrm %%DATADIR%%/profiles/Bluetooth +@dirrm %%DATADIR%%/profiles @dirrm %%DATADIR%%/help @dirrm %%DATADIR%%/dtds @dirrm %%DATADIR%%/diameter