wireshark: updated to 3.0.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wireshark: updated to 3.0.1
From: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Date: Tue, 16 Apr 2019 13:04:08 +0000
Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Tue Apr 16 15:04:08 2019 +0200
Changeset:	e5cf5996d3ac02eb74ac98f5ff6378999da7dd3e

Modified Files:
	wireshark/Makefile
	wireshark/PLIST
	wireshark/distinfo
	wireshark/options.mk
	wireshark/patches/patch-CMakeLists.txt
Removed Files:
	wireshark/TODO

Log Message:
wireshark: updated to 3.0.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e5cf5996d3ac02eb74ac98f5ff6378999da7dd3e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wireshark/Makefile                     |  17 ++--
 wireshark/PLIST                        | 161 +++++++++++++++++----------------
 wireshark/TODO                         |   1 -
 wireshark/distinfo                     |  10 +-
 wireshark/options.mk                   |  28 +-----
 wireshark/patches/patch-CMakeLists.txt |  28 +++++-
 6 files changed, 124 insertions(+), 121 deletions(-)

diffs:
diff --git a/wireshark/Makefile b/wireshark/Makefile
index 24a4e32ea9..c246350165 100644
--- a/wireshark/Makefile
+++ b/wireshark/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.205 2019/03/07 10:39:52 adam Exp $
 
-DISTNAME=	wireshark-3.0.0
+DISTNAME=	wireshark-3.0.1
 CATEGORIES=	net
 MASTER_SITES=	https://www.wireshark.org/download/src/
 EXTRACT_SUFX=	.tar.xz
@@ -10,22 +10,16 @@ HOMEPAGE=	https://www.wireshark.org/
 COMMENT=	Network protocol analyzer
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS+=		ethereal-[0-9]*
+CONFLICTS+=	ethereal-[0-9]*
 
 USE_CMAKE=		yes
+CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=		-DENABLE_APPLICATION_BUNDLE=OFF
 CMAKE_ARG_PATH=		..
+CONFIGURE_DIRS=		build
 
 USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl pkg-config yacc lex
-
-CONFIGURE_DIRS=		build
-
-#CONFIGURE_ARGS+=	--enable-static=no
-#CONFIGURE_ARGS+=	--with-pcap=${BUILDLINK_PREFIX.libpcap}
-#CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
-#CONFIGURE_ENV+=		ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc}
-#CONFIGURE_ENV+=		ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex}
 PKGCONFIG_OVERRIDE+=	wireshark.pc.in
 
 CHECK_PORTABILITY_SKIP+=	packaging/macosx/*/*
@@ -74,6 +68,7 @@ BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../geography/libmaxminddb/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../net/libcares/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/wireshark/PLIST b/wireshark/PLIST
index 3d7b7be615..ff2e07269d 100644
--- a/wireshark/PLIST
+++ b/wireshark/PLIST
@@ -5,6 +5,7 @@ bin/dumpcap
 bin/editcap
 bin/idl2wrs
 bin/mergecap
+bin/mmdbresolve
 bin/randpkt
 bin/rawshark
 bin/reordercap
@@ -12,8 +13,8 @@ bin/sharkd
 bin/text2pcap
 bin/tshark
 ${PLIST.qt}bin/wireshark
-${PLIST.gtk3}bin/wireshark-gtk
 include/wireshark/cfile.h
+include/wireshark/cli_main.h
 include/wireshark/codecs/codecs.h
 include/wireshark/epan/addr_and_mask.h
 include/wireshark/epan/addr_resolv.h
@@ -49,7 +50,7 @@ include/wireshark/epan/dfilter/drange.h
 include/wireshark/epan/diam_dict.h
 include/wireshark/epan/disabled_protos.h
 include/wireshark/epan/dissector_filters.h
-include/wireshark/epan/dissectors/dissectors.h
+include/wireshark/epan/dissectors/file-rbm.h
 include/wireshark/epan/dissectors/packet-6lowpan.h
 include/wireshark/epan/dissectors/packet-a21.h
 include/wireshark/epan/dissectors/packet-acp133.h
@@ -93,7 +94,6 @@ include/wireshark/epan/dissectors/packet-charging_ase.h
 include/wireshark/epan/dissectors/packet-chdlc.h
 include/wireshark/epan/dissectors/packet-cip.h
 include/wireshark/epan/dissectors/packet-cipsafety.h
-include/wireshark/epan/dissectors/packet-clearcase.h
 include/wireshark/epan/dissectors/packet-cmip.h
 include/wireshark/epan/dissectors/packet-cmp.h
 include/wireshark/epan/dissectors/packet-cms.h
@@ -104,42 +104,22 @@ include/wireshark/epan/dissectors/packet-csn1.h
 include/wireshark/epan/dissectors/packet-dap.h
 include/wireshark/epan/dissectors/packet-dcc.h
 include/wireshark/epan/dissectors/packet-dccp.h
-include/wireshark/epan/dissectors/packet-dcerpc-atsvc.h
 include/wireshark/epan/dissectors/packet-dcerpc-browser.h
 include/wireshark/epan/dissectors/packet-dcerpc-budb.h
 include/wireshark/epan/dissectors/packet-dcerpc-butc.h
-include/wireshark/epan/dissectors/packet-dcerpc-clusapi.h
 include/wireshark/epan/dissectors/packet-dcerpc-dce122.h
 include/wireshark/epan/dissectors/packet-dcerpc-dcom.h
-include/wireshark/epan/dissectors/packet-dcerpc-dfs.h
 include/wireshark/epan/dissectors/packet-dcerpc-dnsserver.h
-include/wireshark/epan/dissectors/packet-dcerpc-drsuapi.h
-include/wireshark/epan/dissectors/packet-dcerpc-dssetup.h
-include/wireshark/epan/dissectors/packet-dcerpc-efs.h
-include/wireshark/epan/dissectors/packet-dcerpc-eventlog.h
 include/wireshark/epan/dissectors/packet-dcerpc-frsapi.h
 include/wireshark/epan/dissectors/packet-dcerpc-frsrpc.h
-include/wireshark/epan/dissectors/packet-dcerpc-frstrans.h
-include/wireshark/epan/dissectors/packet-dcerpc-initshutdown.h
-include/wireshark/epan/dissectors/packet-dcerpc-lsa.h
-include/wireshark/epan/dissectors/packet-dcerpc-mapi.h
-include/wireshark/epan/dissectors/packet-dcerpc-mdssvc.h
-include/wireshark/epan/dissectors/packet-dcerpc-misc.h
 include/wireshark/epan/dissectors/packet-dcerpc-netlogon.h
-include/wireshark/epan/dissectors/packet-dcerpc-nspi.h
 include/wireshark/epan/dissectors/packet-dcerpc-nt.h
 include/wireshark/epan/dissectors/packet-dcerpc-pnp.h
-include/wireshark/epan/dissectors/packet-dcerpc-rfr.h
 include/wireshark/epan/dissectors/packet-dcerpc-rras.h
 include/wireshark/epan/dissectors/packet-dcerpc-samr.h
 include/wireshark/epan/dissectors/packet-dcerpc-spoolss.h
-include/wireshark/epan/dissectors/packet-dcerpc-srvsvc.h
 include/wireshark/epan/dissectors/packet-dcerpc-svcctl.h
 include/wireshark/epan/dissectors/packet-dcerpc-tapi.h
-include/wireshark/epan/dissectors/packet-dcerpc-winreg.h
-include/wireshark/epan/dissectors/packet-dcerpc-witness.h
-include/wireshark/epan/dissectors/packet-dcerpc-wkssvc.h
-include/wireshark/epan/dissectors/packet-dcerpc-wzcsvc.h
 include/wireshark/epan/dissectors/packet-dcerpc.h
 include/wireshark/epan/dissectors/packet-dcom-dispatch.h
 include/wireshark/epan/dissectors/packet-dcom.h
@@ -173,7 +153,6 @@ include/wireshark/epan/dissectors/packet-fcels.h
 include/wireshark/epan/dissectors/packet-fcfcs.h
 include/wireshark/epan/dissectors/packet-fcfzs.h
 include/wireshark/epan/dissectors/packet-fclctl.h
-include/wireshark/epan/dissectors/packet-fcp.h
 include/wireshark/epan/dissectors/packet-fcsb3.h
 include/wireshark/epan/dissectors/packet-fcswils.h
 include/wireshark/epan/dissectors/packet-ff.h
@@ -181,11 +160,11 @@ include/wireshark/epan/dissectors/packet-fix.h
 include/wireshark/epan/dissectors/packet-fmp.h
 include/wireshark/epan/dissectors/packet-frame.h
 include/wireshark/epan/dissectors/packet-ftam.h
+include/wireshark/epan/dissectors/packet-geonw.h
 include/wireshark/epan/dissectors/packet-giop.h
 include/wireshark/epan/dissectors/packet-gluster.h
 include/wireshark/epan/dissectors/packet-gmr1_common.h
 include/wireshark/epan/dissectors/packet-gmr1_rr.h
-include/wireshark/epan/dissectors/packet-gnutella.h
 include/wireshark/epan/dissectors/packet-gprscdr.h
 include/wireshark/epan/dissectors/packet-gre.h
 include/wireshark/epan/dissectors/packet-gsm_a_common.h
@@ -204,6 +183,7 @@ include/wireshark/epan/dissectors/packet-h245.h
 include/wireshark/epan/dissectors/packet-h248.h
 include/wireshark/epan/dissectors/packet-h263.h
 include/wireshark/epan/dissectors/packet-h264.h
+include/wireshark/epan/dissectors/packet-h265.h
 include/wireshark/epan/dissectors/packet-h323.h
 include/wireshark/epan/dissectors/packet-h450-ros.h
 include/wireshark/epan/dissectors/packet-hpext.h
@@ -214,6 +194,7 @@ include/wireshark/epan/dissectors/packet-iax2.h
 include/wireshark/epan/dissectors/packet-icmp.h
 include/wireshark/epan/dissectors/packet-idmp.h
 include/wireshark/epan/dissectors/packet-idp.h
+include/wireshark/epan/dissectors/packet-ieee1609dot2.h
 include/wireshark/epan/dissectors/packet-ieee80211-radio.h
 include/wireshark/epan/dissectors/packet-ieee80211-radiotap-defs.h
 include/wireshark/epan/dissectors/packet-ieee80211-radiotap-iter.h
@@ -234,11 +215,13 @@ include/wireshark/epan/dissectors/packet-isis-clv.h
 include/wireshark/epan/dissectors/packet-isis.h
 include/wireshark/epan/dissectors/packet-isl.h
 include/wireshark/epan/dissectors/packet-isup.h
+include/wireshark/epan/dissectors/packet-its.h
 include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h
 include/wireshark/epan/dissectors/packet-juniper.h
 include/wireshark/epan/dissectors/packet-jxta.h
 include/wireshark/epan/dissectors/packet-kerberos.h
-include/wireshark/epan/dissectors/packet-klm.h
+include/wireshark/epan/dissectors/packet-knxip.h
+include/wireshark/epan/dissectors/packet-knxip_decrypt.h
 include/wireshark/epan/dissectors/packet-l2tp.h
 include/wireshark/epan/dissectors/packet-lapdm.h
 include/wireshark/epan/dissectors/packet-lbm.h
@@ -249,13 +232,13 @@ include/wireshark/epan/dissectors/packet-lcsap.h
 include/wireshark/epan/dissectors/packet-ldap.h
 include/wireshark/epan/dissectors/packet-ldp.h
 include/wireshark/epan/dissectors/packet-link16.h
+include/wireshark/epan/dissectors/packet-lisp.h
 include/wireshark/epan/dissectors/packet-llc.h
 include/wireshark/epan/dissectors/packet-lnet.h
 include/wireshark/epan/dissectors/packet-logotypecertextn.h
 include/wireshark/epan/dissectors/packet-lpp.h
 include/wireshark/epan/dissectors/packet-lte-rrc.h
 include/wireshark/epan/dissectors/packet-mac-lte.h
-include/wireshark/epan/dissectors/packet-mac-nr.h
 include/wireshark/epan/dissectors/packet-mausb.h
 include/wireshark/epan/dissectors/packet-mbim.h
 include/wireshark/epan/dissectors/packet-mbtcp.h
@@ -265,7 +248,6 @@ include/wireshark/epan/dissectors/packet-mms.h
 include/wireshark/epan/dissectors/packet-mount.h
 include/wireshark/epan/dissectors/packet-mp4ves.h
 include/wireshark/epan/dissectors/packet-mpeg-descriptor.h
-include/wireshark/epan/dissectors/packet-mpeg-pmt.h
 include/wireshark/epan/dissectors/packet-mpeg-sect.h
 include/wireshark/epan/dissectors/packet-mpls.h
 include/wireshark/epan/dissectors/packet-mq.h
@@ -280,8 +262,8 @@ include/wireshark/epan/dissectors/packet-ndmp.h
 include/wireshark/epan/dissectors/packet-ndps.h
 include/wireshark/epan/dissectors/packet-netbios.h
 include/wireshark/epan/dissectors/packet-netlink.h
-include/wireshark/epan/dissectors/packet-netmon.h
 include/wireshark/epan/dissectors/packet-nfs.h
+include/wireshark/epan/dissectors/packet-ngap.h
 include/wireshark/epan/dissectors/packet-nisplus.h
 include/wireshark/epan/dissectors/packet-nlm.h
 include/wireshark/epan/dissectors/packet-nr-rrc.h
@@ -290,6 +272,7 @@ include/wireshark/epan/dissectors/packet-ntlmssp.h
 include/wireshark/epan/dissectors/packet-ntp.h
 include/wireshark/epan/dissectors/packet-nvme.h
 include/wireshark/epan/dissectors/packet-ocsp.h
+include/wireshark/epan/dissectors/packet-oer.h
 include/wireshark/epan/dissectors/packet-opensafety.h
 include/wireshark/epan/dissectors/packet-oscore.h
 include/wireshark/epan/dissectors/packet-osi-options.h
@@ -301,6 +284,7 @@ include/wireshark/epan/dissectors/packet-p772.h
 include/wireshark/epan/dissectors/packet-pcap_pktdata.h
 include/wireshark/epan/dissectors/packet-pcnfsd.h
 include/wireshark/epan/dissectors/packet-pdcp-lte.h
+include/wireshark/epan/dissectors/packet-pdcp-nr.h
 include/wireshark/epan/dissectors/packet-per.h
 include/wireshark/epan/dissectors/packet-pkcs1.h
 include/wireshark/epan/dissectors/packet-pkcs12.h
@@ -311,12 +295,10 @@ include/wireshark/epan/dissectors/packet-pkixac.h
 include/wireshark/epan/dissectors/packet-pkixproxy.h
 include/wireshark/epan/dissectors/packet-pkixqualified.h
 include/wireshark/epan/dissectors/packet-pkixtsp.h
-include/wireshark/epan/dissectors/packet-pktc.h
 include/wireshark/epan/dissectors/packet-portmap.h
 include/wireshark/epan/dissectors/packet-ppi-geolocation-common.h
 include/wireshark/epan/dissectors/packet-ppp.h
 include/wireshark/epan/dissectors/packet-pres.h
-include/wireshark/epan/dissectors/packet-protobuf.h
 include/wireshark/epan/dissectors/packet-ptp.h
 include/wireshark/epan/dissectors/packet-ptpip.h
 include/wireshark/epan/dissectors/packet-pw-atm.h
@@ -339,7 +321,6 @@ include/wireshark/epan/dissectors/packet-rohc.h
 include/wireshark/epan/dissectors/packet-ros.h
 include/wireshark/epan/dissectors/packet-rpc.h
 include/wireshark/epan/dissectors/packet-rpcrdma.h
-include/wireshark/epan/dissectors/packet-rquota.h
 include/wireshark/epan/dissectors/packet-rrc.h
 include/wireshark/epan/dissectors/packet-rsvp.h
 include/wireshark/epan/dissectors/packet-rtcp.h
@@ -348,7 +329,6 @@ include/wireshark/epan/dissectors/packet-rtp.h
 include/wireshark/epan/dissectors/packet-rtps.h
 include/wireshark/epan/dissectors/packet-rtse.h
 include/wireshark/epan/dissectors/packet-rtsp.h
-include/wireshark/epan/dissectors/packet-rwall.h
 include/wireshark/epan/dissectors/packet-rx.h
 include/wireshark/epan/dissectors/packet-s1ap.h
 include/wireshark/epan/dissectors/packet-s5066sis.h
@@ -380,14 +360,12 @@ include/wireshark/epan/dissectors/packet-smrse.h
 include/wireshark/epan/dissectors/packet-snmp.h
 include/wireshark/epan/dissectors/packet-socketcan.h
 include/wireshark/epan/dissectors/packet-spice.h
-include/wireshark/epan/dissectors/packet-spray.h
 include/wireshark/epan/dissectors/packet-sprt.h
 include/wireshark/epan/dissectors/packet-sscop.h
-include/wireshark/epan/dissectors/packet-ssl-utils.h
-include/wireshark/epan/dissectors/packet-ssl.h
 include/wireshark/epan/dissectors/packet-stat-notify.h
 include/wireshark/epan/dissectors/packet-stat.h
 include/wireshark/epan/dissectors/packet-sv.h
+include/wireshark/epan/dissectors/packet-syslog.h
 include/wireshark/epan/dissectors/packet-t124.h
 include/wireshark/epan/dissectors/packet-t30.h
 include/wireshark/epan/dissectors/packet-t38.h
@@ -395,8 +373,8 @@ include/wireshark/epan/dissectors/packet-tacacs.h
 include/wireshark/epan/dissectors/packet-tcap.h
 include/wireshark/epan/dissectors/packet-tcp.h
 include/wireshark/epan/dissectors/packet-tetra.h
-include/wireshark/epan/dissectors/packet-tftp.h
-include/wireshark/epan/dissectors/packet-thrift.h
+include/wireshark/epan/dissectors/packet-tls-utils.h
+include/wireshark/epan/dissectors/packet-tls.h
 include/wireshark/epan/dissectors/packet-tn3270.h
 include/wireshark/epan/dissectors/packet-tn5250.h
 include/wireshark/epan/dissectors/packet-tpkt.h
@@ -447,15 +425,6 @@ include/wireshark/epan/dissectors/packet-zbee-zcl.h
 include/wireshark/epan/dissectors/packet-zbee-zdp.h
 include/wireshark/epan/dissectors/packet-zbee.h
 include/wireshark/epan/dissectors/packet-ziop.h
-include/wireshark/epan/dissectors/read_keytab_file.h
-include/wireshark/epan/dissectors/snort-config.h
-include/wireshark/epan/dissectors/x11-declarations.h
-include/wireshark/epan/dissectors/x11-enum.h
-include/wireshark/epan/dissectors/x11-extension-errors.h
-include/wireshark/epan/dissectors/x11-extension-implementation.h
-include/wireshark/epan/dissectors/x11-glx-render-enum.h
-include/wireshark/epan/dissectors/x11-keysym.h
-include/wireshark/epan/dissectors/x11-register-info.h
 include/wireshark/epan/dtd.h
 include/wireshark/epan/dtd_parse.h
 include/wireshark/epan/dvb_chartbl.h
@@ -516,7 +485,7 @@ include/wireshark/epan/req_resp_hdrs.h
 include/wireshark/epan/rtd_table.h
 include/wireshark/epan/rtp_pt.h
 include/wireshark/epan/sctpppids.h
-include/wireshark/epan/sequence_analysis.h
+include/wireshark/epan/secrets.h
 include/wireshark/epan/show_exception.h
 include/wireshark/epan/slow_protocol_subtypes.h
 include/wireshark/epan/sminmpec.h
@@ -561,25 +530,25 @@ include/wireshark/epan/xdlc.h
 include/wireshark/file.h
 include/wireshark/globals.h
 include/wireshark/log.h
+include/wireshark/version_info.h
 include/wireshark/wiretap/file_wrappers.h
 include/wireshark/wiretap/merge.h
 include/wireshark/wiretap/pcap-encap.h
 include/wireshark/wiretap/pcapng_module.h
+include/wireshark/wiretap/secrets-types.h
 include/wireshark/wiretap/wtap.h
 include/wireshark/wiretap/wtap_opttypes.h
 include/wireshark/ws_attributes.h
 include/wireshark/ws_compiler_tests.h
 include/wireshark/ws_diag_control.h
 include/wireshark/ws_symbol_export.h
+include/wireshark/ws_version.h
 include/wireshark/wsutil/adler32.h
 include/wireshark/wsutil/base32.h
-include/wireshark/wsutil/base64.h
 include/wireshark/wsutil/bits_count_ones.h
 include/wireshark/wsutil/bits_ctz.h
 include/wireshark/wsutil/bitswap.h
 include/wireshark/wsutil/buffer.h
-include/wireshark/wsutil/clopts_common.h
-include/wireshark/wsutil/cmdarg_err.h
 include/wireshark/wsutil/color.h
 include/wireshark/wsutil/copyright_info.h
 include/wireshark/wsutil/cpu_info.h
@@ -592,17 +561,19 @@ include/wireshark/wsutil/crc32.h
 include/wireshark/wsutil/crc6.h
 include/wireshark/wsutil/crc7.h
 include/wireshark/wsutil/crc8.h
+include/wireshark/wsutil/curve25519.h
 include/wireshark/wsutil/eax.h
 include/wireshark/wsutil/filesystem.h
 include/wireshark/wsutil/frequency-utils.h
 include/wireshark/wsutil/g711.h
-include/wireshark/wsutil/glib-compat.h
 include/wireshark/wsutil/inet_addr.h
 include/wireshark/wsutil/inet_ipv4.h
 include/wireshark/wsutil/inet_ipv6.h
 include/wireshark/wsutil/interface.h
 include/wireshark/wsutil/jsmn.h
+include/wireshark/wsutil/json_dumper.h
 include/wireshark/wsutil/mpeg-audio.h
+include/wireshark/wsutil/netlink.h
 include/wireshark/wsutil/nstime.h
 include/wireshark/wsutil/os_version_info.h
 include/wireshark/wsutil/pint.h
@@ -611,7 +582,6 @@ include/wireshark/wsutil/pow2.h
 include/wireshark/wsutil/privileges.h
 include/wireshark/wsutil/processes.h
 include/wireshark/wsutil/report_message.h
-include/wireshark/wsutil/rsa.h
 include/wireshark/wsutil/sign_ext.h
 include/wireshark/wsutil/sober128.h
 include/wireshark/wsutil/socket.h
@@ -628,35 +598,49 @@ include/wireshark/wsutil/ws_mempbrk.h
 include/wireshark/wsutil/ws_mempbrk_int.h
 include/wireshark/wsutil/ws_pipe.h
 include/wireshark/wsutil/ws_printf.h
-include/wireshark/wsutil/wsgcrypt.h
-include/wireshark/wsutil/wsgetopt.h
-include/wireshark/wsutil/wsjsmn.h
-include/wireshark/wsutil/wspcap.h
+include/wireshark/wsutil/wsjson.h
 include/wireshark/wsutil/xtea.h
-lib/libwireshark.la
-lib/libwiretap.la
-lib/libwscodecs.la
-lib/libwsutil.la
+lib/libwireshark.so
+lib/libwireshark.so.12
+lib/libwireshark.so.12.0.1
+lib/libwiretap.so
+lib/libwiretap.so.9
+lib/libwiretap.so.9.0.1
+lib/libwscodecs.so
+lib/libwscodecs.so.2
+lib/libwscodecs.so.2.0.0
+lib/libwsutil.so
+lib/libwsutil.so.10
+lib/libwsutil.so.10.0.0
 lib/pkgconfig/wireshark.pc
+lib/wireshark/cmake/FindGLIB2.cmake
+lib/wireshark/cmake/FindWSWinLibs.cmake
+lib/wireshark/cmake/LocatePythonModule.cmake
+lib/wireshark/cmake/UseAsn2Wrs.cmake
+lib/wireshark/cmake/UseMakePluginReg.cmake
+lib/wireshark/cmake/WiresharkConfig.cmake
+lib/wireshark/cmake/WiresharkConfigVersion.cmake
+lib/wireshark/cmake/WiresharkTargets-release.cmake
+lib/wireshark/cmake/WiresharkTargets.cmake
 lib/wireshark/extcap/androiddump
 lib/wireshark/extcap/ciscodump
 lib/wireshark/extcap/randpktdump
 lib/wireshark/extcap/sshdump
 lib/wireshark/extcap/udpdump
-lib/wireshark/plugins/2.6/codecs/l16mono.la
-lib/wireshark/plugins/2.6/epan/ethercat.la
-lib/wireshark/plugins/2.6/epan/gryphon.la
-lib/wireshark/plugins/2.6/epan/irda.la
-lib/wireshark/plugins/2.6/epan/mate.la
-lib/wireshark/plugins/2.6/epan/opcua.la
-lib/wireshark/plugins/2.6/epan/profinet.la
-lib/wireshark/plugins/2.6/epan/stats_tree.la
-lib/wireshark/plugins/2.6/epan/transum.la
-lib/wireshark/plugins/2.6/epan/unistim.la
-lib/wireshark/plugins/2.6/epan/wimax.la
-lib/wireshark/plugins/2.6/epan/wimaxasncp.la
-lib/wireshark/plugins/2.6/epan/wimaxmacphy.la
-lib/wireshark/plugins/2.6/wiretap/usbdump.la
+lib/wireshark/plugins/3.0/codecs/l16mono.so
+lib/wireshark/plugins/3.0/epan/ethercat.so
+lib/wireshark/plugins/3.0/epan/gryphon.so
+lib/wireshark/plugins/3.0/epan/irda.so
+lib/wireshark/plugins/3.0/epan/mate.so
+lib/wireshark/plugins/3.0/epan/opcua.so
+lib/wireshark/plugins/3.0/epan/profinet.so
+lib/wireshark/plugins/3.0/epan/stats_tree.so
+lib/wireshark/plugins/3.0/epan/transum.so
+lib/wireshark/plugins/3.0/epan/unistim.so
+lib/wireshark/plugins/3.0/epan/wimax.so
+lib/wireshark/plugins/3.0/epan/wimaxasncp.so
+lib/wireshark/plugins/3.0/epan/wimaxmacphy.so
+lib/wireshark/plugins/3.0/wiretap/usbdump.so
 man/man1/androiddump.1
 man/man1/capinfos.1
 man/man1/captype.1
@@ -665,6 +649,7 @@ man/man1/dftest.1
 man/man1/dumpcap.1
 man/man1/editcap.1
 man/man1/mergecap.1
+man/man1/mmdbresolve.1
 man/man1/randpkt.1
 man/man1/randpktdump.1
 man/man1/rawshark.1
@@ -676,8 +661,27 @@ man/man1/udpdump.1
 ${PLIST.mans}man/man1/wireshark.1
 man/man4/extcap.4
 man/man4/wireshark-filter.4
+share/doc/wireshark/androiddump.html
+share/doc/wireshark/capinfos.html
+share/doc/wireshark/captype.html
+share/doc/wireshark/ciscodump.html
+share/doc/wireshark/dftest.html
+share/doc/wireshark/dumpcap.html
+share/doc/wireshark/editcap.html
+share/doc/wireshark/extcap.html
+share/doc/wireshark/mergecap.html
+share/doc/wireshark/mmdbresolve.html
+share/doc/wireshark/randpkt.html
+share/doc/wireshark/randpktdump.html
+share/doc/wireshark/rawshark.html
+share/doc/wireshark/reordercap.html
+share/doc/wireshark/sshdump.html
+share/doc/wireshark/text2pcap.html
+share/doc/wireshark/tshark.html
+share/doc/wireshark/udpdump.html
+share/doc/wireshark/wireshark-filter.html
+share/doc/wireshark/wireshark.html
 ${PLIST.icons}share/appdata/wireshark.appdata.xml
-${PLIST.icons}share/applications/wireshark-gtk.desktop
 ${PLIST.icons}share/applications/wireshark.desktop
 ${PLIST.icons}share/icons/hicolor/128x128/apps/wireshark.png
 ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
@@ -760,11 +764,12 @@ share/wireshark/extcap.html
 share/wireshark/help/capture_filters.txt
 share/wireshark/help/capturing.txt
 share/wireshark/help/display_filters.txt
-share/wireshark/help/faq.txt
+share/wireshark/help/faq.py
 share/wireshark/help/getting_started.txt
 share/wireshark/help/overview.txt
 share/wireshark/help/toc
 ${PLIST.lua}share/wireshark/init.lua
+share/wireshark/ipmap.html
 share/wireshark/manuf
 share/wireshark/mergecap.html
 share/wireshark/mmdbresolve.html
@@ -772,6 +777,7 @@ share/wireshark/pdml2html.xsl
 share/wireshark/profiles/Bluetooth/colorfilters
 share/wireshark/profiles/Bluetooth/preferences
 share/wireshark/profiles/Classic/colorfilters
+share/wireshark/profiles/No Reassembly/preferences
 share/wireshark/radius/README.radius_dictionary
 share/wireshark/radius/custom.includes
 share/wireshark/radius/dictionary
@@ -961,6 +967,7 @@ share/wireshark/radius/dictionary.unix
 share/wireshark/radius/dictionary.usr
 share/wireshark/radius/dictionary.utstarcom
 share/wireshark/radius/dictionary.valemount
+share/wireshark/radius/dictionary.verizon
 share/wireshark/radius/dictionary.versanet
 share/wireshark/radius/dictionary.vqp
 share/wireshark/radius/dictionary.walabi
diff --git a/wireshark/TODO b/wireshark/TODO
deleted file mode 100644
index 613544eaef..0000000000
--- a/wireshark/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Fails in link step because it doesn't find QtSvg library.
diff --git a/wireshark/distinfo b/wireshark/distinfo
index 07ba41d3bd..69913f8288 100644
--- a/wireshark/distinfo
+++ b/wireshark/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.118 2019/03/07 10:39:52 adam Exp $
 
-SHA1 (wireshark-3.0.0.tar.xz) = c254d850c81d85964aa23d60bb6fdb1373032490
-RMD160 (wireshark-3.0.0.tar.xz) = 9211657dc9d58eae871547d90021c376bb52f761
-SHA512 (wireshark-3.0.0.tar.xz) = 917708b5edc25609536c7bd7cf4ae32a901fd99118302138dc0bf6f1ad092a8e5069a917cc8cf6cb77190f54e50623a4eba1ee10ffc225ee3051b50cf02a0963
-Size (wireshark-3.0.0.tar.xz) = 30953760 bytes
-SHA1 (patch-CMakeLists.txt) = a297c6ce713c304dba09cd93b717ad04d4519874
+SHA1 (wireshark-3.0.1.tar.xz) = 33b880fb76b356dce4713a207c0bb9624f9b2c43
+RMD160 (wireshark-3.0.1.tar.xz) = 27ed3498a1e9a89706c1461736219c4ae4b08085
+SHA512 (wireshark-3.0.1.tar.xz) = 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d
+Size (wireshark-3.0.1.tar.xz) = 30903792 bytes
+SHA1 (patch-CMakeLists.txt) = 431afe779ed4c41ef11f2dc94f1c0e665610d6b5
diff --git a/wireshark/options.mk b/wireshark/options.mk
index ec3130d85c..c00b4109ae 100644
--- a/wireshark/options.mk
+++ b/wireshark/options.mk
@@ -1,45 +1,25 @@
 # $NetBSD: options.mk,v 1.22 2018/12/03 15:35:15 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.wireshark
-PKG_SUPPORTED_OPTIONS=		gtk3 http2 lua qt5
+PKG_SUPPORTED_OPTIONS=		http2 lua qt5
 PKG_SUGGESTED_OPTIONS=		qt5 lua
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gtk3 icons lua mans qt
+PLIST_VARS+=		icons lua mans qt
 
 .if !empty(PKG_OPTIONS:Mqt5)
-#CONFIGURE_ARGS+=	--with-qt=5
+.  include "../../x11/qt5-qtsvg/buildlink3.mk"
 .  include "../../x11/qt5-qttools/buildlink3.mk"
 .  if ${OPSYS} == "Darwin"
 .    include "../../x11/qt5-qtmacextras/buildlink3.mk"
 .  else
 .    include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .  endif
-CONFIGURE_ENV+=		LRELEASE=${QTDIR}/bin/lrelease
-CONFIGURE_ENV+=		MOC=${QTDIR}/bin/moc
-CONFIGURE_ENV+=		RCC=${QTDIR}/bin/rcc
-CONFIGURE_ENV+=		UIC=${QTDIR}/bin/uic
 PLIST.qt=		yes
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk3)
-#CONFIGURE_ARGS+=	--with-gtk=3
-PLIST.gtk3=		yes
-POST_INSTALL_TARGETS+=	install-gtk-desktop
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
-
-.PHONY: install-gtk-desktop
-install-gtk-desktop:
-	${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \
-		${DESTDIR}${PREFIX}/share/applications/
-
-.else
-#CONFIGURE_ARGS+=	--without-gtk
-.endif
-
-.if empty(PKG_OPTIONS:Mgtk3) && empty(PKG_OPTIONS:Mqt5)
+.if empty(PKG_OPTIONS:Mqt5)
 #CONFIGURE_ARGS+=	--disable-wireshark
 .else
 #CONFIGURE_ARGS+=	--enable-wireshark
diff --git a/wireshark/patches/patch-CMakeLists.txt b/wireshark/patches/patch-CMakeLists.txt
index ce9a4574f4..ecdef7bbe8 100644
--- a/wireshark/patches/patch-CMakeLists.txt
+++ b/wireshark/patches/patch-CMakeLists.txt
@@ -1,14 +1,36 @@
 $NetBSD$
 
+Do not make application bundle on Darwin.
 Avoid
 	CMake Error at CMakeLists.txt:3021 (install):
   	install FILES given directory
   	"${WRKDIR}/.buildlink/cmake-Modules" to install.
 
-
---- CMakeLists.txt.orig	2019-03-25 14:33:39.354346985 +0000
+--- CMakeLists.txt.orig	2019-04-08 18:39:58.000000000 +0000
 +++ CMakeLists.txt
-@@ -3020,11 +3020,11 @@ endif()
+@@ -1319,7 +1319,7 @@ else ()
+ 	set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir")
+ endif()
+ 
+-if(APPLE)
++if(APPLE AND ENABLE_APPLICATION_BUNDLE)
+ 	#
+ 	# As https://developer.apple.com/library/archive/technotes/tn2206/_index.html
+ 	# says,
+@@ -2229,7 +2229,11 @@ if(BUILD_wireshark AND QT_FOUND)
+ 		$<$<BOOL:${WIN32}>:UxTheme.lib>
+ 	)
+ 
+-	add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
++	if(ENABLE_APPLICATION_BUNDLE)
++		add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
++	else()
++		add_executable(wireshark WIN32 ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
++	endif()
+ 	set(PROGLIST ${PROGLIST} wireshark)
+ 	set_target_properties(wireshark PROPERTIES
+ 		LINK_FLAGS "${WS_LINK_FLAGS}"
+@@ -3022,11 +3026,11 @@ endif()
  
  install(
  	FILES
Prev by Date: thedarkmod: Add a basic do-install stage.
Next by Date: cgal: update to 4.14, depending on qt5
Previous by Thread: thedarkmod: Add a basic do-install stage.
Next by Thread: cgal: update to 4.14, depending on qt5
Indexes:
Home | Main Index | Thread Index | Old Index