net/wireshark: Update to 4.2.0

See https://www.wireshark.org/docs/relnotes/wireshark-4.2.0.html for a
list of changes in this release.

Of note to FreeBSD users, wireshark now uses Qt6 (rather than 5), and
development files (e.g., headers), while installed by default can be
disabled by unchecking the DEVELOPMENT option.

net/wireshark/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	wireshark
-DISTVERSION=	4.0.10
+DISTVERSION=	4.2.0
 CATEGORIES=	net
 MASTER_SITES=	https://1.na.dl.wireshark.org/src/ \
 		https://1.eu.dl.wireshark.org/src/ \
@@ -43,14 +43,14 @@ CMAKE_OFF=	ENABLE_ILBC ENABLE_MINIZIP ENABLE_SBC
 CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN:BOOL=True \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=True
 
-OPTIONS_DEFINE=		ANDROIDDUMP DOCS GNUTLS GUI LIBSSH LTO LUA \
+OPTIONS_DEFINE=		ANDROIDDUMP DEVELOPMENT DOCS GNUTLS GUI LIBSSH LTO LUA \
 			MANPAGES MAXMIND RTP SNMP
 .if ${FLAVOR} == nox11
 COMMENT+=		(without GUI)
 OPTIONS_EXCLUDE=	GUI RTP
 .endif
 
-OPTIONS_DEFAULT=	ANDROIDDUMP GNUTLS GSSAPI_BASE GUI MANPAGES MAXMIND \
+OPTIONS_DEFAULT=	ANDROIDDUMP DEVELOPMENT GNUTLS GSSAPI_BASE GUI MANPAGES MAXMIND \
 			RTP SNMP
 OPTIONS_DEFAULT_aarch64=LTO
 OPTIONS_DEFAULT_amd64=	LTO
@@ -59,8 +59,9 @@ OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SUB=		yes
 
 ANDROIDDUMP_DESC=	Build androiddump extcap tool
+DEVELOPMENT_DESC=	Install development headers and support files
 GNUTLS_DESC=		Enable crypto support for SSL and IPSec via GnuTLS
-GUI_DESC=		Enable Qt 5 based Wireshark GUI
+GUI_DESC=		Enable Qt 6 based Wireshark GUI
 LIBSSH_DESC=		Enable libssh support (req by cisco/ssh/wifidump)
 MAXMIND_DESC=		Enable MaxMindDB-based GeoIP geolocation support
 RTP_DESC=		Enable codec support for RTP streams (implies GUI)
@@ -78,8 +79,8 @@ GSSAPI_MIT_USES=	gssapi:mit
 GSSAPI_NONE_CONFIGURE_ENV_OFF=	KRB5_CONFIG=${KRB5CONFIG}
 GSSAPI_NONE_CMAKE_BOOL=	ENABLE_KERBEROS
 
-GUI_USES=		desktop-file-utils shared-mime-info qt:5
+GUI_USES=		desktop-file-utils shared-mime-info qt:6
-GUI_USE=		qt=core,concurrent,gui,multimedia,widgets,printsupport,svg,buildtools:build,linguisttools:build,qmake:build
+GUI_USE=		qt=5compat,base,multimedia,svg,tools
 GUI_CONFIGURE_ENV=	PATH="${PATH}:${QT_BINDIR}"
 GUI_MAKE_ENV=		PATH="${PATH}:${QT_BINDIR}"
 GUI_CMAKE_BOOL=		BUILD_wireshark
@@ -120,6 +121,9 @@ post-patch:
 		s|/usr/share|${LOCALBASE}/share|g' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|lua$${LUA_INC_SUFFIX}|lua-${LUA_VER}|g' \
-	    	${WRKSRC}/cmake/modules/FindLUA.cmake
+	    	${WRKSRC}/cmake/modules/FindLua.cmake
+
+post-install-DEVELOPMENT-on:
+	cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${CMAKE_BIN} ${CMAKE_ARGS} -DCOMPONENT=Development -P cmake_install.cmake
 
 .include <bsd.port.mk>

net/wireshark/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1696693135
+TIMESTAMP = 1700168149
-SHA256 (wireshark-4.0.10.tar.xz) = b2e3ff03fa2be9058a9ffbedd12b0a670433bd16c8cc6c432ab48dabc2df1898
+SHA256 (wireshark-4.2.0.tar.xz) = 0e428492f4c3625d61a7ccff008dc0e429d16ab8caccad4403157ea92b48a75b
-SIZE (wireshark-4.0.10.tar.xz) = 43124192
+SIZE (wireshark-4.2.0.tar.xz) = 44941948

net/wireshark/files/extra-patch-doc_CMakeLists.txt

@@ -1,58 +0,0 @@
---- doc/CMakeLists.txt.orig	2022-10-11 14:38:02.853482000 -0400
-+++ doc/CMakeLists.txt	2022-10-11 14:39:14.016917000 -0400
-@@ -42,25 +42,39 @@ macro (ADD_MAN_PAGE _page_name _man_section)
- 	endif()
- endmacro()
- 
-+macro (ADD_MAN_PAGE_NO_INSTALL _page_name _man_section)
-+       if(ASCIIDOCTOR_FOUND)
-+               list(APPEND HTML_INSTALL_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_page_name}.html)
-+
-+               if (${_man_section} EQUAL 1)
-+                       list(APPEND MAN1_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_page_name}.adoc)
-+               elseif (${_man_section} EQUAL 4)
-+                       list(APPEND MAN4_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_page_name}.adoc)
-+               else()
-+                       message(FATAL_ERROR "Unsupported manual page section ${_man_section} for ${_page_name}")
-+               endif()
-+       endif()
-+endmacro()
-+
- ADD_MAN_PAGE(wireshark   1)
--ADD_MAN_PAGE(androiddump 1)
--ADD_MAN_PAGE(capinfos    1)
--ADD_MAN_PAGE(captype     1)
--ADD_MAN_PAGE(ciscodump   1)
--ADD_MAN_PAGE(dftest      1)
-+ADD_MAN_PAGE_NO_INSTALL(androiddump 1)
-+ADD_MAN_PAGE_NO_INSTALL(capinfos    1)
-+ADD_MAN_PAGE_NO_INSTALL(captype     1)
-+ADD_MAN_PAGE_NO_INSTALL(ciscodump   1)
-+ADD_MAN_PAGE_NO_INSTALL(dftest      1)
- ADD_MAN_PAGE(dumpcap     1)
--ADD_MAN_PAGE(editcap     1)
--ADD_MAN_PAGE(mergecap    1)
--ADD_MAN_PAGE(randpkt     1)
--ADD_MAN_PAGE(randpktdump 1)
--ADD_MAN_PAGE(etwdump     1)
--ADD_MAN_PAGE(rawshark    1)
--ADD_MAN_PAGE(reordercap  1)
--ADD_MAN_PAGE(sshdump     1)
--ADD_MAN_PAGE(text2pcap   1)
-+ADD_MAN_PAGE_NO_INSTALL(editcap     1)
-+ADD_MAN_PAGE_NO_INSTALL(mergecap    1)
-+ADD_MAN_PAGE_NO_INSTALL(randpkt     1)
-+ADD_MAN_PAGE_NO_INSTALL(randpktdump 1)
-+ADD_MAN_PAGE_NO_INSTALL(etwdump     1)
-+ADD_MAN_PAGE_NO_INSTALL(rawshark    1)
-+ADD_MAN_PAGE_NO_INSTALL(reordercap  1)
-+ADD_MAN_PAGE_NO_INSTALL(sshdump     1)
-+ADD_MAN_PAGE_NO_INSTALL(text2pcap   1)
- ADD_MAN_PAGE(tshark      1)
--ADD_MAN_PAGE(udpdump     1)
--ADD_MAN_PAGE(wifidump    1)
-+ADD_MAN_PAGE_NO_INSTALL(udpdump     1)
-+ADD_MAN_PAGE_NO_INSTALL(wifidump    1)
- 
- ADD_MAN_PAGE(extcap           4)
- ADD_MAN_PAGE(wireshark-filter 4)

net/wireshark/files/patch-extcap.c

@@ -1,6 +1,6 @@
---- extcap.c.orig	2019-02-28 17:56:38 UTC
+--- extcap.c.orig	2023-11-15 18:30:18 UTC
 +++ extcap.c
-@@ -21,6 +21,7 @@
+@@ -22,6 +22,7 @@
  #include <process.h>
  #include <time.h>
  #else