Date: Sun, 10 Aug 2014 03:26:32 +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: r364496 - in head/net/wireshark: . files Message-ID: <53e6e669.2095.2ea16552@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Sun Aug 10 03:26:32 2014 New Revision: 364496 URL: http://svnweb.freebsd.org/changeset/ports/364496 QAT: https://qat.redports.org/buildarchive/r364496/ Log: Update to 1.12.0 and switch to GTK+ 3.0 for the GUI. See https://www.wireshark.org/docs/relnotes/wireshark-1.12.0.html for the changes in this release. 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 Sun Aug 10 03:09:33 2014 (r364495) +++ head/net/wireshark/Makefile Sun Aug 10 03:26:32 2014 (r364496) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= wireshark -PORTVERSION= 1.10.8 -PORTREVISION= 2 +PORTVERSION= 1.12.0 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ @@ -21,12 +20,13 @@ COMMENT?= Powerful network analyzer/capt DATADIR_NAME= wireshark USE_PERL5= build -USE_PYTHON_BUILD=yes -USES= iconv gettext pkgconfig gmake perl5 tar:bzip2 libtool +USES= iconv gettext pkgconfig gmake perl5 tar:bzip2 libtool \ + python:build WANT_GNOME= yes USE_OPENSSL= yes CONFIGURE_ARGS+= --program-transform-name="" \ - --with-ssl=${OPENSSLBASE} + --with-ssl=${OPENSSLBASE} \ + --with-qt=no USE_LDCONFIG= yes DATADIR= ${PREFIX}/share/${DATADIR_NAME} CFLAGS+= -funit-at-a-time @@ -37,7 +37,7 @@ DESKTOP_ENTRIES= "Wireshark" "Network Pr "wireshark" "System;Monitor;GTK;" true .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ - reordercap + reordercap captype .if defined(LITE) PLIST_SUB+= ${x:tu}="@comment $x not installed" \ ${x:tu}_MAN="@comment $x not installed " @@ -67,7 +67,8 @@ USE_XORG= x11 .if ${PORT_OPTIONS:MX11} PLIST_SUB+= WIRESHARK=bin/wireshark WIRESHARK_MAN="" -USE_GNOME+= gtk20 +USE_GNOME+= gtk30 +CONFIGURE_ARGS+=--with-gtk3=yes .else PLIST_SUB+= WIRESHARK="@comment wireshark not built" \ WIRESHARK_MAN="@comment wireshark not built " Modified: head/net/wireshark/distinfo ============================================================================== --- head/net/wireshark/distinfo Sun Aug 10 03:09:33 2014 (r364495) +++ head/net/wireshark/distinfo Sun Aug 10 03:26:32 2014 (r364496) @@ -1,2 +1,2 @@ -SHA256 (wireshark-1.10.8.tar.bz2) = 27d9cf4f0ca1ac436104b7f27caf8ad65f73db09edc8df0742ce9688c7d38763 -SIZE (wireshark-1.10.8.tar.bz2) = 26715025 +SHA256 (wireshark-1.12.0.tar.bz2) = 0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7 +SIZE (wireshark-1.12.0.tar.bz2) = 29033823 Modified: head/net/wireshark/files/patch-epan_Makefile.in ============================================================================== --- head/net/wireshark/files/patch-epan_Makefile.in Sun Aug 10 03:09:33 2014 (r364495) +++ head/net/wireshark/files/patch-epan_Makefile.in Sun Aug 10 03:26:32 2014 (r364496) @@ -1,10 +1,10 @@ ---- 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@ +--- epan/Makefile.in.orig 2014-07-31 15:23:19.000000000 -0400 ++++ epan/Makefile.in 2014-08-09 22:55:55.000000000 -0400 +@@ -150,6 +150,7 @@ DIST_COMMON = $(srcdir)/../Makefile.am.i + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/doxygen.cfg.in $(top_srcdir)/depcomp @HAVE_WARNINGS_AS_ERRORS_TRUE@am__append_1 = -Werror - EXTRA_PROGRAMS = reassemble_test$(EXEEXT) ++LIBS = @LUA_LIBS@ + EXTRA_PROGRAMS = reassemble_test$(EXEEXT) tvbtest$(EXEEXT) \ + oids_test$(EXEEXT) subdir = epan Modified: head/net/wireshark/pkg-plist ============================================================================== --- head/net/wireshark/pkg-plist Sun Aug 10 03:09:33 2014 (r364495) +++ head/net/wireshark/pkg-plist Sun Aug 10 03:26:32 2014 (r364496) @@ -1,4 +1,5 @@ %%CAPINFOS%% +%%CAPTYPE%% %%DFTEST%% bin/dumpcap %%EDITCAP%% @@ -9,16 +10,18 @@ bin/dumpcap %%REORDERCAP%% bin/tshark %%TEXT2PCAP%% +lib/libfiletap.so +lib/libfiletap.so.0 +lib/libfiletap.so.0.0.0 lib/libwireshark.so -lib/libwireshark.so.3 -lib/libwireshark.so.3.1.8 +lib/libwireshark.so.5 +lib/libwireshark.so.5.0.0 lib/libwiretap.so -lib/libwiretap.so.3 -lib/libwiretap.so.3.0.8 +lib/libwiretap.so.4 +lib/libwiretap.so.4.0.0 lib/libwsutil.so -lib/libwsutil.so.3 -lib/libwsutil.so.3.0.0 -lib/wireshark/plugins/%%PORTVERSION%%/asn1.so +lib/libwsutil.so.4 +lib/libwsutil.so.4.0.0 lib/wireshark/plugins/%%PORTVERSION%%/docsis.so lib/wireshark/plugins/%%PORTVERSION%%/ethercat.so lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so @@ -57,14 +60,17 @@ man/man4/wireshark-filter.4.gz %%DATADIR%%/diameter/AlcatelLucent.xml %%DATADIR%%/diameter/ChinaTelecom.xml %%DATADIR%%/diameter/Cisco.xml +%%DATADIR%%/diameter/Custom.xml %%DATADIR%%/diameter/Ericsson.xml %%DATADIR%%/diameter/Nokia.xml %%DATADIR%%/diameter/NokiaSiemensNetworks.xml %%DATADIR%%/diameter/SKT.xml +%%DATADIR%%/diameter/Starent.xml %%DATADIR%%/diameter/TGPPGmb.xml %%DATADIR%%/diameter/TGPPRx.xml %%DATADIR%%/diameter/TGPPS9.xml %%DATADIR%%/diameter/TGPPSh.xml +%%DATADIR%%/diameter/VerizonWireless.xml %%DATADIR%%/diameter/Vodafone.xml %%DATADIR%%/diameter/chargecontrol.xml %%DATADIR%%/diameter/dictionary.dtd @@ -118,6 +124,7 @@ man/man4/wireshark-filter.4.gz %%DATADIR%%/radius/dictionary.alcatel %%DATADIR%%/radius/dictionary.alcatel.esam %%DATADIR%%/radius/dictionary.alcatel.sr +%%DATADIR%%/radius/dictionary.alcatel-lucent.aaa %%DATADIR%%/radius/dictionary.alcatel-lucent.xylan %%DATADIR%%/radius/dictionary.alteon %%DATADIR%%/radius/dictionary.altiga
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e6e669.2095.2ea16552>