CVS commit: pkgsrc/net/wireshark

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Dec 30 17:48:05 UTC 2019

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

Log Message:
wireshark: updated to 3.2.0

Wireshark 3.2.0

What’s New

This is the last release branch with official support for Windows 7
and Windows Server 2008 R2.

Many improvements have been made. See the “New and Updated Features”
section below for more details.

New and Updated Features

 The following features are new (or have been significantly updated)
 since version 3.2.0rc2:

   • Minor bug fixes.

 The following features are new (or have been significantly updated)
 since version 3.2.0rc1:

   • Minor bug fixes.

 The following features are new (or have been significantly updated)
 since version 3.1.1:

   • Miscellaneous UI fixes and updates.

   • The macOS installer now ships with Qt 5.12.6. It previously
     shipped with Qt 5.12.5.

 The following features are new (or have been significantly updated)
 since version 3.1.0:

   • Automatic updates are supported on macOS.

   • You can now select multiple packets in the packet list at the
     same time

   • They can be exported as Text by “Ctrl+C” or “Cmd+C” and the
     corresponding menu in “Edit › Copy › As …<U+200B>”

   • They can be marked/unmarked or ignored/unignored at the same time

   • They can be exported and printed using the corresponding menu
     entries “File › Export Specified Packets”, “File › Export Packet
     Dissections” and “File › Print”

 You can now follow HTTP/2 and QUIC streams.

 You can once again mark and unmark packets using the middle mouse
 button. This feature went missing around 2009 or so.

 The Windows packages are now built using Microsoft Visual Studio
 2019.

 IOGraph automatically adds a graph for the selected display filter if
 no previous graph exists

 Action buttons for the display filter bar may be aligned left via the
 context menu

   • The "Expression…<U+200B>" toolbar entry has been moved to "Analyze ›
     Display filter Expression …<U+200B>" as well as to the context menu of
     the display filter toolbar

 Allow extcaps to be loaded from the personal configuration directory

 The Wireshark 3.1.0 Windows installers ship with Qt 5.12.6. Previous
 installers shipped with Qt 5.12.4.

 The following features are new (or have been significantly updated)
 since version 3.0.0:

   • You can drag and drop a field to a column header to create a
     column for that field, or to the display filter input to create a
     display filter. If a display filter is applied, the new filter
     can be added using the same rules as “Apply Filter”

   • You can drag and drop a column entry to the display filter to
     create a filter for it.

   • You can import profiles from a .zip archive or an existing
     directory.

   • Dark mode support on macOS and dark theme support on other
     platforms has been improved.

   • Brotli decompression support in HTTP/HTTP2 (requires the brotli
     library).

   • The build system now checks for a SpeexDSP system library
     installation. The bundled Speex resampler code is still provided
     as a fallback.

   • WireGuard decryption can now be enabled through keys embedded in
     a pcapng in addition to the existing key log preference (Bug
     15571[1]).

   • A new tap for extracting credentials from the capture file has
     been added. It can be accessed through the -z credentials option
     in tshark or from the “Tools › Credentials” menu in Wireshark.

   • Editcap can now split files on floating point intervals.

   • Windows .msi packages are now signed using SHA-2[2]. .exe
     installers are still dual-signed using SHA-1 and SHA-2.

   • The “Enabled Protocols” Dialog now only enables, disables and
     inverts protocols based on the set filter selection. The protocol
     type (standard or heuristic) may also be choosen as a filter
     value.

   • Save RTP stream to .au supports any codec with 8000 Hz rate
     supported by Wireshark (shown in RTP player). If save of audio is
     not possible (unsupported codec or rate), silence of same length
     is saved and warning is shown.

   • The “Analyze › Apply as Filter” and “Analyze › Prepare a Filter”
     packet list and detail popup menus now show a preview of their
     respective filters.

   • Protobuf files (*.proto) can now be configured to enable more
     precise parsing of serialized Protobuf data (such as gRPC).

   • HTTP2 support streaming mode reassembly. To use this feature,
     subdissectors can register itself to "streaming_content_type"
     dissector table and return pinfo→desegment_len and
     pinfo→desegment_offset to tell HTTP2 when to start and how many
     additional bytes requires when next called.

   • The message of stream gRPC method can now be parsed with
     supporting of HTTP2 streaming mode reassembly feature.

   • The Wireshark 3.1.0 Windows installers ship with Qt 5.12.4.
     Previous installers shipped with Qt 5.12.1.

New Protocol Support

 3GPP BICC MST (BICC-MST), 3GPP log packet (LOG3GPP), 3GPP/GSM Cell
 Broadcast Service Protocol (cbsp), Asynchronous Management Protocol
 (AMP), Bluetooth Mesh Beacon, Bluetooth Mesh PB-ADV, Bluetooth Mesh
 Provisioning PDU, Bluetooth Mesh Proxy, CableLabs Layer-3 Protocol
 IEEE EtherType 0xb4e3 (CL3), DCOM IProvideClassInfo, DCOM ITypeInfo,
 Diagnostic Log and Trace (DLT), Distributed Replicated Block Device
 (DRBD), Dual Channel Wi-Fi (CL3DCW), EBHSCR Protocol (EBHSCR), EERO
 Protocol (EERO), evolved Common Public Radio Interface (eCPRI), File
 Server Remote VSS Protocol (FSRVP), FTDI FT USB Bridging Devices
 (FTDI FT), Graylog Extended Log Format over UDP (GELF), GSM/3GPP CBSP
 (Cell Broadcast Service Protocol), ITS message - CAMv1, ITS message -
 DENMv1, Linux net_dm (network drop monitor) protocol, MIDI System
 Exclusive DigiTech (SYSEX DigiTech), Network Controller Sideband
 Interface (NCSI), NR Positioning Protocol A (NRPPa) TS 38.455, NVM
 Express over Fabrics for TCP (nvme-tcp), OsmoTRX Protocol (GSM
 Transceiver control and data), Scalable service-Oriented MiddlewarE
 over IP (SOME/IP), USB 2.0 Link Layer (USBLL), and Wi-Fi Neighbour
 Awareness Networking (NAN)

Updated Protocol Support

 Too many protocols have been updated to list here.

New and Updated Capture File Support

 3gpp phone, Android Logcat Text, Ascend, Busmaster log file, Candump,
 Endace ERF, NetScaler, pcapng, and Savvius *Peek


To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/wireshark/PLIST
cvs rdiff -u -r1.125 -r1.126 pkgsrc/net/wireshark/distinfo
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/wireshark/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.220 pkgsrc/net/wireshark/Makefile:1.221
--- pkgsrc/net/wireshark/Makefile:1.220 Thu Dec  5 18:41:30 2019
+++ pkgsrc/net/wireshark/Makefile       Mon Dec 30 17:48:05 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.220 2019/12/05 18:41:30 adam Exp $
+# $NetBSD: Makefile,v 1.221 2019/12/30 17:48:05 adam Exp $
 
-DISTNAME=      wireshark-3.0.7
+DISTNAME=      wireshark-3.2.0
 CATEGORIES=    net
 MASTER_SITES=  https://www.wireshark.org/download/src/
 EXTRACT_SUFX=  .tar.xz
@@ -15,6 +15,7 @@ CONFLICTS+=   ethereal-[0-9]*
 USE_CMAKE=             yes
 CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=           -DENABLE_APPLICATION_BUNDLE=OFF
+CMAKE_ARGS+=           -DVCSVERSION_OVERRIDE=${PKGVERSION_NOREV}
 CMAKE_ARG_PATH=                ..
 CONFIGURE_DIRS=                build
 
@@ -23,6 +24,7 @@ USE_TOOLS+=           gmake perl pkg-config yacc 
 PKGCONFIG_OVERRIDE+=   wireshark.pc.in
 
 CHECK_PORTABILITY_SKIP+=       packaging/macosx/*/*
+CHECK_PORTABILITY_SKIP+=       tools/bsd-setup.sh
 
 PTHREAD_OPTS+=         require
 
@@ -63,7 +65,10 @@ BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
 # [-Wint-conversion]
 BUILDLINK_TRANSFORM+=  rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
 
+.include "../../archivers/brotli/buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
+.include "../../audio/speexdsp/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libsmi/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"

Index: pkgsrc/net/wireshark/PLIST
diff -u pkgsrc/net/wireshark/PLIST:1.46 pkgsrc/net/wireshark/PLIST:1.47
--- pkgsrc/net/wireshark/PLIST:1.46     Thu Dec  5 18:41:30 2019
+++ pkgsrc/net/wireshark/PLIST  Mon Dec 30 17:48:05 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.46 2019/12/05 18:41:30 adam Exp $
+@comment $NetBSD: PLIST,v 1.47 2019/12/30 17:48:05 adam Exp $
 bin/capinfos
 bin/captype
 bin/dumpcap
@@ -15,7 +15,6 @@ bin/tshark
 ${PLIST.qt}bin/wireshark
 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
 include/wireshark/epan/address.h
@@ -38,6 +37,7 @@ include/wireshark/epan/column.h
 include/wireshark/epan/conv_id.h
 include/wireshark/epan/conversation.h
 include/wireshark/epan/conversation_debug.h
+include/wireshark/epan/conversation_filter.h
 include/wireshark/epan/conversation_table.h
 include/wireshark/epan/crc10-tvb.h
 include/wireshark/epan/crc16-tvb.h
@@ -49,7 +49,6 @@ include/wireshark/epan/dfilter/dfilter.h
 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/file-rbm.h
 include/wireshark/epan/dissectors/packet-6lowpan.h
 include/wireshark/epan/dissectors/packet-a21.h
@@ -71,6 +70,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-ber.h
 include/wireshark/epan/dissectors/packet-bfd.h
 include/wireshark/epan/dissectors/packet-bgp.h
+include/wireshark/epan/dissectors/packet-bicc_mst.h
 include/wireshark/epan/dissectors/packet-bluetooth.h
 include/wireshark/epan/dissectors/packet-bssap.h
 include/wireshark/epan/dissectors/packet-bssgp.h
@@ -108,7 +108,6 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-dcerpc-budb.h
 include/wireshark/epan/dissectors/packet-dcerpc-butc.h
 include/wireshark/epan/dissectors/packet-dcerpc-dce122.h
-include/wireshark/epan/dissectors/packet-dcerpc-dcom.h
 include/wireshark/epan/dissectors/packet-dcerpc-dnsserver.h
 include/wireshark/epan/dissectors/packet-dcerpc-frsapi.h
 include/wireshark/epan/dissectors/packet-dcerpc-frsrpc.h
@@ -135,6 +134,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-dtn.h
 include/wireshark/epan/dissectors/packet-dvbci.h
 include/wireshark/epan/dissectors/packet-e164.h
+include/wireshark/epan/dissectors/packet-e1ap.h
 include/wireshark/epan/dissectors/packet-e212.h
 include/wireshark/epan/dissectors/packet-eapol.h
 include/wireshark/epan/dissectors/packet-edonkey.h
@@ -307,6 +307,7 @@ include/wireshark/epan/dissectors/packet
 include/wireshark/epan/dissectors/packet-q931.h
 include/wireshark/epan/dissectors/packet-q932.h
 include/wireshark/epan/dissectors/packet-qsig.h
+include/wireshark/epan/dissectors/packet-quic.h
 include/wireshark/epan/dissectors/packet-radius.h
 include/wireshark/epan/dissectors/packet-raknet.h
 include/wireshark/epan/dissectors/packet-ranap.h
@@ -373,6 +374,7 @@ include/wireshark/epan/dissectors/packet
 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-thrift.h
 include/wireshark/epan/dissectors/packet-tls-utils.h
 include/wireshark/epan/dissectors/packet-tls.h
 include/wireshark/epan/dissectors/packet-tn3270.h
@@ -549,6 +551,7 @@ include/wireshark/wsutil/bits_count_ones
 include/wireshark/wsutil/bits_ctz.h
 include/wireshark/wsutil/bitswap.h
 include/wireshark/wsutil/buffer.h
+include/wireshark/wsutil/codecs.h
 include/wireshark/wsutil/color.h
 include/wireshark/wsutil/copyright_info.h
 include/wireshark/wsutil/cpu_info.h
@@ -558,6 +561,7 @@ include/wireshark/wsutil/crc11.h
 include/wireshark/wsutil/crc16-plain.h
 include/wireshark/wsutil/crc16.h
 include/wireshark/wsutil/crc32.h
+include/wireshark/wsutil/crc5.h
 include/wireshark/wsutil/crc6.h
 include/wireshark/wsutil/crc7.h
 include/wireshark/wsutil/crc8.h
@@ -577,6 +581,7 @@ include/wireshark/wsutil/netlink.h
 include/wireshark/wsutil/nstime.h
 include/wireshark/wsutil/os_version_info.h
 include/wireshark/wsutil/pint.h
+include/wireshark/wsutil/please_report_bug.h
 include/wireshark/wsutil/plugins.h
 include/wireshark/wsutil/pow2.h
 include/wireshark/wsutil/privileges.h
@@ -601,17 +606,14 @@ include/wireshark/wsutil/ws_printf.h
 include/wireshark/wsutil/wsjson.h
 include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
-lib/libwireshark.so.12
-lib/libwireshark.so.12.0.7
+lib/libwireshark.so.13
+lib/libwireshark.so.13.0.0
 lib/libwiretap.so
-lib/libwiretap.so.9
-lib/libwiretap.so.9.0.7
-lib/libwscodecs.so
-lib/libwscodecs.so.2
-lib/libwscodecs.so.2.0.0
+lib/libwiretap.so.10
+lib/libwiretap.so.10.0.0
 lib/libwsutil.so
-lib/libwsutil.so.10
-lib/libwsutil.so.10.0.0
+lib/libwsutil.so.11
+lib/libwsutil.so.11.0.0
 lib/pkgconfig/wireshark.pc
 lib/wireshark/cmake/FindGLIB2.cmake
 lib/wireshark/cmake/FindWSWinLibs.cmake
@@ -627,20 +629,23 @@ lib/wireshark/extcap/ciscodump
 lib/wireshark/extcap/randpktdump
 lib/wireshark/extcap/sshdump
 lib/wireshark/extcap/udpdump
-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
+lib/wireshark/plugins/3.2/codecs/g711.so
+${PLIST.spandsp}lib/wireshark/plugins/3.2/codecs/g722.so
+${PLIST.spandsp}lib/wireshark/plugins/3.2/codecs/g726.so
+lib/wireshark/plugins/3.2/codecs/l16mono.so
+lib/wireshark/plugins/3.2/epan/ethercat.so
+lib/wireshark/plugins/3.2/epan/gryphon.so
+lib/wireshark/plugins/3.2/epan/irda.so
+lib/wireshark/plugins/3.2/epan/mate.so
+lib/wireshark/plugins/3.2/epan/opcua.so
+lib/wireshark/plugins/3.2/epan/profinet.so
+lib/wireshark/plugins/3.2/epan/stats_tree.so
+lib/wireshark/plugins/3.2/epan/transum.so
+lib/wireshark/plugins/3.2/epan/unistim.so
+lib/wireshark/plugins/3.2/epan/wimax.so
+lib/wireshark/plugins/3.2/epan/wimaxasncp.so
+lib/wireshark/plugins/3.2/epan/wimaxmacphy.so
+lib/wireshark/plugins/3.2/wiretap/usbdump.so
 man/man1/androiddump.1
 man/man1/capinfos.1
 man/man1/captype.1
@@ -715,6 +720,7 @@ share/wireshark/cfilters
 share/wireshark/ciscodump.html
 share/wireshark/colorfilters
 ${PLIST.lua}share/wireshark/console.lua
+share/wireshark/dfilter_macros
 share/wireshark/dfilters
 share/wireshark/dftest.html
 share/wireshark/diameter/AlcatelLucent.xml
@@ -726,12 +732,15 @@ share/wireshark/diameter/HP.xml
 share/wireshark/diameter/Huawei.xml
 share/wireshark/diameter/Inovar.xml
 share/wireshark/diameter/Juniper.xml
+share/wireshark/diameter/Microsoft.xml
 share/wireshark/diameter/Nokia.xml
 share/wireshark/diameter/NokiaSolutionsAndNetworks.xml
 share/wireshark/diameter/Oracle.xml
+share/wireshark/diameter/Siemens.xml
 share/wireshark/diameter/Starent.xml
 share/wireshark/diameter/TGPP.xml
 share/wireshark/diameter/TGPP2.xml
+share/wireshark/diameter/Telefonica.xml
 share/wireshark/diameter/VerizonWireless.xml
 share/wireshark/diameter/Vodafone.xml
 share/wireshark/diameter/chargecontrol.xml
@@ -761,13 +770,6 @@ share/wireshark/dumpcap.html
 share/wireshark/editcap.html
 share/wireshark/enterprises.tsv
 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/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
@@ -798,6 +800,7 @@ share/wireshark/radius/dictionary.altiga
 share/wireshark/radius/dictionary.alvarion
 share/wireshark/radius/dictionary.alvarion.wimax.v2_2
 share/wireshark/radius/dictionary.apc
+share/wireshark/radius/dictionary.aptilo
 share/wireshark/radius/dictionary.aptis
 share/wireshark/radius/dictionary.arbor
 share/wireshark/radius/dictionary.aruba
@@ -876,6 +879,7 @@ share/wireshark/radius/dictionary.localw
 share/wireshark/radius/dictionary.lucent
 share/wireshark/radius/dictionary.manzara
 share/wireshark/radius/dictionary.meinberg
+share/wireshark/radius/dictionary.meraki
 share/wireshark/radius/dictionary.merit
 share/wireshark/radius/dictionary.meru
 share/wireshark/radius/dictionary.microsemi

Index: pkgsrc/net/wireshark/distinfo
diff -u pkgsrc/net/wireshark/distinfo:1.125 pkgsrc/net/wireshark/distinfo:1.126
--- pkgsrc/net/wireshark/distinfo:1.125 Thu Dec  5 18:41:30 2019
+++ pkgsrc/net/wireshark/distinfo       Mon Dec 30 17:48:05 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.125 2019/12/05 18:41:30 adam Exp $
+$NetBSD: distinfo,v 1.126 2019/12/30 17:48:05 adam Exp $
 
-SHA1 (wireshark-3.0.7.tar.xz) = c870ef818952a741773fc1143fba2834c76a1dd0
-RMD160 (wireshark-3.0.7.tar.xz) = 7168f7bf9f724e9ec3236c998c54368d85820718
-SHA512 (wireshark-3.0.7.tar.xz) = 64e242510865ca69e688677e3ee1f72d3efa2155f07bc1aacc6de19ffab06f26b1ef8a3f91a90e91a6612b10d75651aea6400f8c5852e6a7e82e5d3f3e88e031
-Size (wireshark-3.0.7.tar.xz) = 30851928 bytes
-SHA1 (patch-CMakeLists.txt) = c78289d6ded796674b947d6bddd0ba9749ab4569
+SHA1 (wireshark-3.2.0.tar.xz) = 6c7d9784809fb16b57ca557864f78509aaf4f82a
+RMD160 (wireshark-3.2.0.tar.xz) = cb8aab36143465b6e7e8121bc2cbdc8c315494a7
+SHA512 (wireshark-3.2.0.tar.xz) = 30d2d6da4f32167518ec045c9e07f952fa6589a4cde18a765dcc375264005ac9146a36faee77bf701e786ff32b9a673f3f03ccf9ba6c9cb51b2cc120bcabbfcf
+Size (wireshark-3.2.0.tar.xz) = 31550972 bytes
+SHA1 (patch-CMakeLists.txt) = e73e8fa117fda08a5ed5e8293e743c54beb64b5b

Index: pkgsrc/net/wireshark/options.mk
diff -u pkgsrc/net/wireshark/options.mk:1.24 pkgsrc/net/wireshark/options.mk:1.25
--- pkgsrc/net/wireshark/options.mk:1.24        Tue May 14 11:40:36 2019
+++ pkgsrc/net/wireshark/options.mk     Mon Dec 30 17:48:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2019/05/14 11:40:36 adam Exp $
+# $NetBSD: options.mk,v 1.25 2019/12/30 17:48:05 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wireshark
 PKG_SUPPORTED_OPTIONS= http2 lua qt5 spandsp
@@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS=  qt5 lua
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           icons lua qt
+PLIST_VARS+=           icons lua qt spandsp
 
 .if !empty(PKG_OPTIONS:Mhttp2)
 .  include "../../www/nghttp2/buildlink3.mk"
@@ -63,6 +63,7 @@ CMAKE_ARGS+=          -DBUILD_wireshark=OFF
 
 .if !empty(PKG_OPTIONS:Mspandsp)
 .include "../../comms/spandsp/buildlink3.mk"
+PLIST.spandsp=         yes
 CMAKE_ARGS+=           -DENABLE_SPANDSP=ON
 .else
 CMAKE_ARGS+=           -DENABLE_SPANDSP=OFF

Index: pkgsrc/net/wireshark/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.1 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.1       Mon May  6 09:36:47 2019
+++ pkgsrc/net/wireshark/patches/patch-CMakeLists.txt   Mon Dec 30 17:48:05 2019
@@ -1,15 +1,14 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/05/06 09:36:47 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2019/12/30 17:48:05 adam Exp $
 
 Do not make application bundle on Darwin.
-Store correct version number in version.h.
 Avoid
        CMake Error at CMakeLists.txt:3021 (install):
        install FILES given directory
        "${WRKDIR}/.buildlink/cmake-Modules" to install.
 
---- CMakeLists.txt.orig        2019-04-08 18:39:58.000000000 +0000
+--- CMakeLists.txt.orig        2019-12-18 18:27:56.000000000 +0000
 +++ CMakeLists.txt
-@@ -1319,7 +1319,7 @@ else ()
+@@ -1359,7 +1359,7 @@ else ()
        set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir")
  endif()
  
@@ -18,19 +17,8 @@ Avoid
        #
        # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html
        # says,
-@@ -1462,9 +1462,7 @@ gmx_test_large_files(GMX_LARGEFILES)
- set( VERSION ${PROJECT_VERSION} )
- add_custom_target(version
-       BYPRODUCTS version.h
--      COMMAND ${PERL_EXECUTABLE}
--              ${CMAKE_SOURCE_DIR}/tools/make-version.pl
--              ${CMAKE_SOURCE_DIR}
-+      COMMAND ${CMAKE_COMMAND} -E echo '\#define VCSVERSION \"${VERSION}\"' > ${CMAKE_BINARY_DIR}/version.h
- )
- set_target_properties(version PROPERTIES FOLDER "Auxiliary")
- 
-@@ -2229,7 +2227,11 @@ if(BUILD_wireshark AND QT_FOUND)
-               $<$<BOOL:${WIN32}>:UxTheme.lib>
+@@ -2280,7 +2280,11 @@ if(BUILD_wireshark AND QT_FOUND)
+               ${MINIZIP_LIBRARIES}
        )
  
 -      add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
@@ -39,10 +27,10 @@ Avoid
 +      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 +3024,11 @@ endif()
+       if(WIN32)
+               set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT wireshark)
+       endif()
+@@ -3196,11 +3200,11 @@ endif()
  
  install(
        FILES