net/wireshark: Update to 4.0.4 and refactor the port logic

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

This port features the following modifications:

- Use of helpers and consistent usage
- Refresh dependency list
- Use (lib)speexdsp from tree
- Add brotli as dependency, used for compressing data over HTTP2
- Flavourize port and create two variants, one including UI and one without (-nox11)
- Disable detection of git for Wireshark's build
- Rework and consolidate options, try to be as consistent as possible with the rest of the tree
- Rename DECRYPT option to GNUTLS
- Move various *dump tools to one option as they share the same dependency (libssh)
- Make LTO default option on aarch64 and amd64
- RTP audio codecs are only used with GUI so make all use the same toggle

Thanks to diizzy for his refactoring work.  One thing to note for uses
of the -lite ports is that they are going away.  Flavors should be used
to build wireshark with the GUI (default) or without the GUI (nox11).

PR:		269103
Submitted by:	diizzy [port refactoring]

3 files changed, 134 insertions, 226 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index a79edfb0340f..c52b81693a32 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,5 +1,5 @@
-PORTNAME?=	wireshark
-DISTVERSION=	4.0.3
+PORTNAME=	wireshark
+DISTVERSION=	4.0.4
 CATEGORIES=	net
 MASTER_SITES=	https://1.na.dl.wireshark.org/src/ \
 		https://1.eu.dl.wireshark.org/src/ \
@@ -9,195 +9,102 @@ MASTER_SITES=	https://1.na.dl.wireshark.org/src/ \
 		http://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \
 		https://wireshark.marwan.ma/download/src/ \
 		https://www.wireshark.org/download/src/
-DISTNAME=	${DATADIR_NAME}-${DISTVERSION}
 
 MAINTAINER=	marcus@FreeBSD.org
-COMMENT?=	Powerful network analyzer/capture tool
+COMMENT=	Powerful network analyzer/capture tool
 WWW=		https://www.wireshark.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS_INSTALL?=	wireshark-lite tshark tshark-lite
-
-DATADIR_NAME=	wireshark
-DATADIR=	${PREFIX}/share/${DATADIR_NAME}
-
-USES=		alias cmake compiler:c++11-lang cpe gettext-runtime gnome \
-		libtool localbase pathfix perl5 pkgconfig python:3.4+ ssl \
-		tar:xz
-USE_PERL5=	build
-USE_GNOME=	glib20 libxml2
-USE_LDCONFIG=	yes
-
-BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
-LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error \
+LIB_DEPENDS=	libgpg-error.so:security/libgpg-error \
 		libgcrypt.so:security/libgcrypt \
 		liblz4.so:archivers/liblz4 \
 		libnghttp2.so:www/libnghttp2 \
+		libbrotlidec.so:archivers/brotli \
 		libsnappy.so:archivers/snappy \
 		libcares.so:dns/c-ares \
-		libzstd.so:archivers/zstd
-
-#CFLAGS+=	-funit-at-a-time
-
-.for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
-    reordercap captype randpktdump udpdump sharkd etwdump
-.if defined(LITE)
-PKGNAMESUFFIX=		-lite
-PLIST_SUB+=		${x:tu}="@comment $x not installed" \
-			${x:tu}_LIB="@comment $x not installed " \
-			${x:tu}_MAN="@comment $x not installed "
-CMAKE_ARGS+=		-DBUILD_$x=OFF
-EXTRA_PATCHES=		${FILESDIR}/extra-patch-doc_CMakeLists.txt
-OPTIONS_EXCLUDE+=	RTP SNMP LUA ANDROIDDUMP CISCODUMP SSHDUMP WIFIDUMP
-.else
-PLIST_SUB+=		${x:tu}=bin/$x \
-			${x:tu}_MAN="" \
-			${x:tu}_LIB=""
-.endif
-.endfor
+		libzstd.so:archivers/zstd \
+		libspeexdsp.so:audio/speexdsp
 
-OPTIONS_DEFINE=		GUI RTP SNMP MAXMIND LTO LUA DECRYPT ANDROIDDUMP SSHDUMP CISCODUMP OPUS \
-			WIFIDUMP
+FLAVORS=	default nox11
+FLAVOR?=	${FLAVORS:[1]}
+nox11_PKGNAMESUFFIX=	-nox11
 
-OPTIONS_SINGLE=		GSSAPI
+USES=		cmake compiler:c++11-lang cpe gettext-runtime gnome \
+		localbase pathfix perl5 pkgconfig python:3.6+ ssl tar:xz
+USE_GNOME=	glib20 libxml2
+USE_PERL5=	build
+USE_LDCONFIG=	yes
 
-OPTIONS_SINGLE_GSSAPI=GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
+CONFLICTS_INSTALL=	wireshark-lite tshark tshark-lite
 
-OPTIONS_DEFAULT?=	GUI SNMP MAXMIND GSSAPI_BASE DECRYPT
+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=		DOCS GNUTLS GUI LIBSSH LTO LUA MANPAGES MAXMIND \
+			RTP SNMP
+.if ${FLAVOR} == nox11
+COMMENT+=		(without GUI)
+OPTIONS_EXCLUDE=	GUI RTP
+.endif
+
+OPTIONS_DEFAULT=	GNUTLS GSSAPI_BASE GUI MANPAGES MAXMIND RTP SNMP
+OPTIONS_DEFAULT_aarch64=LTO
+OPTIONS_DEFAULT_amd64=	LTO
+OPTIONS_SINGLE=		GSSAPI
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
+OPTIONS_SUB=		yes
+
+GNUTLS_DESC=		Enable crypto support for SSL and IPSec via GnuTLS
 GUI_DESC=		Enable Qt 5 based Wireshark GUI
-RTP_DESC=		Enable support for playing back RTP streams
-DECRYPT_DESC=		Decryption support for SSL and IPSec
-ANDROIDDUMP_DESC=	Build androiddump extcap tool
+LIBSSH_DESC=		Enable libssh support (req by cisco/ssh/wifidump)
 MAXMIND_DESC=		Enable MaxMindDB-based GeoIP geolocation support
-GSSAPI_DESC=		Kerberos dissection support
-GSSAPI_BASE_DESC=		Kerberos support via base system
-GSSAPI_HEIMDAL_DESC=	Kerberos support via security/heimdal
-GSSAPI_MIT_DESC=		Kerberos support via security/krb5
-GSSAPI_NONE_DESC=		Disable Kerberos support
-SSHDUMP_DESC=		Build sshdump extcap tool
-CISCODUMP_DESC=		Build ciscodump extcap tool
-OPUS_DESC=		Build opus decoder plugin
-WIFIDUMP_DESC=		Build wifidump extcap tool
-
-GUI_USES=		qt:5
-GUI_USE=	qt=core,concurrent,gui,multimedia,widgets,printsupport,svg,buildtools:build,linguisttools:build,qmake:build
+RTP_DESC=		Enable codec support for RTP streams (implies GUI)
 
-LTO_CMAKE_BOOL=		ENABLE_LTO
-LUA_USES=		lua:51-52
-GSSAPI_BASE_USES=		gssapi
-GSSAPI_HEIMDAL_USES=	gssapi:heimdal
-GSSAPI_MIT_USES=		gssapi:mit
-
-RTP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
-MAXMIND_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
-SNMP_LIB_DEPENDS=	libsmi.so:net-mgmt/libsmi
-DECRYPT_LIB_DEPENDS=	libgnutls.so:security/gnutls \
-			libgcrypt.so:security/libgcrypt
-SSHDUMP_LIB_DEPENDS=	libssh.so:security/libssh
-CISCODUMP_LIB_DEPENDS=	libssh.so:security/libssh
-OPUS_LIB_DEPENDS=	libopus.so:audio/opus
-WIFIDUMP_LIB_DEPENDS=	libssh.so:security/libssh
-
-GSSAPI_NONE_CMAKE_ON=	-DENABLE_KERBEROS=OFF
-GSSAPI_NONE_CMAKE_OFF=	-DENABLE_KERBEROS=ON
-GSSAPI_NONE_CONFIGURE_ENV_OFF=	KRB5_CONFIG=${KRB5CONFIG}
+DOCS_IMPLIES=		MANPAGES
 
-LUA_CMAKE_ON=	-DENABLE_LUA=ON
-LUA_CMAKE_OFF=	-DENABLE_LUA=OFF
-RTP_CMAKE_ON=	-DENABLE_SPANDSP=ON
-RTP_CMAKE_OFF=	-DENABLE_SPANDSP=OFF
-SNMP_CMAKE_ON=	-DENABLE_SMI=ON
-SNMP_CMAKE_OFF=	-DENABLE_SMI=OFF
-DECRYPT_CMAKE_ON=	-DENABLE_GNUTLS=ON
-DECRYPT_CMAKE_OFF=	-DENABLE_GNUTLS=OFF
-ANDROIDDUMP_CMAKE_ON=-DBUILD_androiddump=ON
-ANDROIDDUMP_CMAKE_OFF=-DBUILD_androiddump=OFF
-SSHDUMP_CMAKE_ON=-DBUILD_sshdump=ON
-SSHDUMP_CMAKE_OFF=-DBUILD_sshdump=OFF
-CISCODUMP_CMAKE_ON=-DBUILD_ciscodump=ON
-CISCODUMP_CMAKE_OFF=-DBUILD_ciscodump=OFF
-OPUS_CMAKE_ON=	-DENABLE_OPUS=ON
-OPUS_CMAKE_OFF=	-DENABLE_OPUS=OFF
-WIFIDUMP_CMAKE_ON=-DBUILD_wifidump=ON
-WIFIDUMP_CMAKE_OFF=-DBUILD_wifidump=OFF
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+GNUTLS_CMAKE_BOOL=	ENABLE_GNUTLS
 
-LUA_CPPFLAGS=		-I${LUA_INCDIR}
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+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_USE=		qt=core,concurrent,gui,multimedia,widgets,printsupport,svg,buildtools:build,linguisttools:build,qmake:build
 GUI_CONFIGURE_ENV=	PATH="${PATH}:${QT_BINDIR}"
 GUI_MAKE_ENV=		PATH="${PATH}:${QT_BINDIR}"
+GUI_CMAKE_BOOL=		BUILD_wireshark
 
-OPTIONS_SUB=		yes
+LIBSSH_LIB_DEPENDS=	libssh.so:security/libssh
+LIBSSH_CMAKE_BOOL=	BUILD_ciscodump BUILD_sshdump BUILD_wifidump
 
-.if defined(LITE)
-CMAKE_ARGS+=	-DBUILD_androiddump=OFF \
-		-DBUILD_sshdump=OFF \
-		-DBUILD_ciscodump=OFF \
-		-DENABLE_OPUS=OFF
-PLIST_SUB+=	ANDROIDDUMP_LIB="@comment " \
-		ANDROIDDUMP_MAN="@comment " \
-		SSHDUMP_LIB="@comment " \
-		SSHDUMP_MAN="@comment " \
-		CISCODUMP_LIB="@comment " \
-		CISCODUMP_MAN="@comment " \
-		OPUS="@comment " \
-		WIFIDUMP_LIB="@comment " \
-		WIFIDUMP_MAN="@comment "
-.endif
+LTO_CMAKE_BOOL=		ENABLE_LTO
 
-.include <bsd.port.options.mk>
+LUA_USES=		lua:51-52
+LUA_CPPFLAGS=		-I${LUA_INCDIR}
+LUA_CMAKE_BOOL=		ENABLE_LUA
 
-.if empty(PORT_OPTIONS:MMAXMIND)
-CMAKE_ARGS+=	-DBUILD_mmdbresolve=OFF
-.else
-CMAKE_ARGS+=	-DBUILD_mmdbresolve=ON
-.endif
+MANPAGES_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
+MANPAGES_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor:BOOL=True
 
-.if empty(PORT_OPTIONS:MGUI)
-CMAKE_ARGS+=	-DBUILD_wireshark=OFF
-PLIST_SUB+=	GUI="@comment "
-.else
-USES+=		desktop-file-utils shared-mime-info
-PLIST_SUB+=	GUI=""
-.endif
+MAXMIND_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
+MAXMIND_CMAKE_BOOL=	BUILD_mmdbresolve
 
-.if !defined(LITE)
-.if ${PORT_OPTIONS:MANDROIDDUMP}
-PLIST_SUB+=	ANDROIDDUMP_LIB="" \
-		ANDROIDDUMP_MAN=""
-.else
-PLIST_SUB+=	ANDROIDDUMP_LIB="@comment " \
-		ANDROIDDUMP_MAN="@comment "
-.endif
-.if ${PORT_OPTIONS:MSSHDUMP}
-PLIST_SUB+=	SSHDUMP_LIB="" \
-		SSHDUMP_MAN=""
-.else
-PLIST_SUB+=	SSHDUMP_LIB="@comment " \
-		SSHDUMP_MAN="@comment "
-.endif
-.if ${PORT_OPTIONS:MCISCODUMP}
-PLIST_SUB+=	CISCODUMP_LIB="" \
-		CISCODUMP_MAN=""
-.else
-PLIST_SUB+=	CISCODUMP_LIB="@comment " \
-		CISCODUMP_MAN="@comment "
-.endif
-.if ${PORT_OPTIONS:MOPUS}
-PLIST_SUB+=	OPUS=""
-.else
-PLIST_SUB+=	OPUS="@comment "
-.endif
-.if ${PORT_OPTIONS:MWIFIDUMP}
-PLIST_SUB+=	WIFIDUMP_LIB="" \
-		WIFIDUMP_MAN=""
-.else
-PLIST_SUB+=	WIFIDUMP_LIB="@comment " \
-		WIFIDUMP_MAN="@comment "
-.endif
-.endif
+RTP_LIB_DEPENDS=	libbcg729.so:audio/bcg729 \
+			libopus.so:audio/opus \
+			libspandsp.so:comms/spandsp
+RTP_CMAKE_BOOL=		ENABLE_BCG729 ENABLE_OPUS ENABLE_SPANDSP
+RTP_IMPLIES=		GUI
+
+SNMP_LIB_DEPENDS=	libsmi.so:net-mgmt/libsmi
+SNMP_CMAKE_BOOL=	ENABLE_SMI
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGSSAPI_BASE} && exists(${LOCALBASE}/include/krb5.h)
 IGNORE=			cannot build with base Kerberos if krb5 port is installed. \
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 15b9b7fcd5bd..1e380f91f70e 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674226636
-SHA256 (wireshark-4.0.3.tar.xz) = 6c51e15bcc0afb93734e686dbff354ffd159f570bd2904bcbbad6f3feb7e9511
-SIZE (wireshark-4.0.3.tar.xz) = 41383164
+TIMESTAMP = 1677869721
+SHA256 (wireshark-4.0.4.tar.xz) = a4a09f6564f00639036ffe5064ac4dc2176adfa3e484c539c9c73f835436e74b
+SIZE (wireshark-4.0.4.tar.xz) = 41399396
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index dd4ab64bdc29..721f7865c5cf 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -1,19 +1,19 @@
-%%CAPINFOS%%
-%%CAPTYPE%%
 @group network
 @mode 2555
 bin/dumpcap
 @mode
 @group
-%%EDITCAP%%
 bin/idl2wrs
-%%MERGECAP%%
-%%RANDPKT%%
-%%RAWSHARK%%
-%%REORDERCAP%%
-%%SHARKD%%
-%%TEXT2PCAP%%
+bin/capinfos
+bin/captype
+bin/editcap
+bin/mergecap
 %%MAXMIND%%bin/mmdbresolve
+bin/randpkt
+bin/rawshark
+bin/reordercap
+bin/sharkd
+bin/text2pcap
 bin/tshark
 %%GUI%%bin/wireshark
 include/wireshark/cfile.h
@@ -653,10 +653,10 @@ include/wireshark/wsutil/wslog.h
 include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
 lib/libwireshark.so.16
-lib/libwireshark.so.16.0.3
+lib/libwireshark.so.16.0.4
 lib/libwiretap.so
 lib/libwiretap.so.13
-lib/libwiretap.so.13.0.3
+lib/libwiretap.so.13.0.4
 lib/libwsutil.so
 lib/libwsutil.so.14
 lib/libwsutil.so.14.0.0
@@ -670,17 +670,18 @@ lib/wireshark/cmake/WiresharkConfig.cmake
 lib/wireshark/cmake/WiresharkConfigVersion.cmake
 lib/wireshark/cmake/WiresharkTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/wireshark/cmake/WiresharkTargets.cmake
-%%ANDROIDDUMP_LIB%%lib/wireshark/extcap/androiddump
-%%CISCODUMP_LIB%%lib/wireshark/extcap/ciscodump
-%%RANDPKTDUMP_LIB%%lib/wireshark/extcap/randpktdump
-%%SSHDUMP_LIB%%lib/wireshark/extcap/sshdump
-%%UDPDUMP_LIB%%lib/wireshark/extcap/udpdump
-%%WIFIDUMP_LIB%%lib/wireshark/extcap/wifidump
+lib/wireshark/extcap/androiddump
+%%LIBSSH%%lib/wireshark/extcap/ciscodump
+lib/wireshark/extcap/randpktdump
+%%LIBSSH%%lib/wireshark/extcap/sshdump
+lib/wireshark/extcap/udpdump
+%%LIBSSH%%lib/wireshark/extcap/wifidump
 lib/wireshark/plugins/4.0/codecs/g711.so
 %%RTP%%lib/wireshark/plugins/4.0/codecs/g722.so
 %%RTP%%lib/wireshark/plugins/4.0/codecs/g726.so
+%%RTP%%lib/wireshark/plugins/4.0/codecs/g729.so
 lib/wireshark/plugins/4.0/codecs/l16mono.so
-%%OPUS%%lib/wireshark/plugins/4.0/codecs/opus_dec.so
+%%RTP%%lib/wireshark/plugins/4.0/codecs/opus_dec.so
 lib/wireshark/plugins/4.0/epan/ethercat.so
 lib/wireshark/plugins/4.0/epan/gryphon.so
 lib/wireshark/plugins/4.0/epan/irda.so
@@ -695,28 +696,28 @@ lib/wireshark/plugins/4.0/epan/wimaxasncp.so
 lib/wireshark/plugins/4.0/epan/wimaxmacphy.so
 lib/wireshark/plugins/4.0/wiretap/usbdump.so
 libdata/pkgconfig/wireshark.pc
-%%ANDROIDDUMP_MAN%%share/man/man1/androiddump.1.gz
-%%CAPINFOS_MAN%%share/man/man1/capinfos.1.gz
-%%CAPTYPE_MAN%%share/man/man1/captype.1.gz
-%%CISCODUMP_MAN%%share/man/man1/ciscodump.1.gz
-%%DFTEST_MAN%%share/man/man1/dftest.1.gz
-share/man/man1/dumpcap.1.gz
-%%EDITCAP_MAN%%share/man/man1/editcap.1.gz
-%%MERGECAP_MAN%%share/man/man1/mergecap.1.gz
-%%MAXMIND%%share/man/man1/mmdbresolve.1.gz
-%%RANDPKT_MAN%%share/man/man1/randpkt.1.gz
-%%RANDPKTDUMP_MAN%%share/man/man1/randpktdump.1.gz
-%%RAWSHARK_MAN%%share/man/man1/rawshark.1.gz
-%%REORDERCAP_MAN%%share/man/man1/reordercap.1.gz
-%%SSHDUMP_MAN%%share/man/man1/sshdump.1.gz
-%%TEXT2PCAP_MAN%%share/man/man1/text2pcap.1.gz
-share/man/man1/tshark.1.gz
-%%UDPDUMP_MAN%%share/man/man1/udpdump.1.gz
-%%WIFIDUMP_MAN%%share/man/man1/wifidump.1.gz
-%%GUI%%share/man/man1/wireshark.1.gz
-%%ETWDUMP_MAN%%share/man/man1/etwdump.1.gz
-share/man/man4/extcap.4.gz
-share/man/man4/wireshark-filter.4.gz
+%%MANPAGES%%share/man/man1/androiddump.1.gz
+%%MANPAGES%%share/man/man1/capinfos.1.gz
+%%MANPAGES%%share/man/man1/captype.1.gz
+%%MANPAGES%%%%LIBSSH%%share/man/man1/ciscodump.1.gz
+%%MANPAGES%%share/man/man1/dftest.1.gz
+%%MANPAGES%%share/man/man1/dumpcap.1.gz
+%%MANPAGES%%share/man/man1/editcap.1.gz
+%%MANPAGES%%share/man/man1/etwdump.1.gz
+%%MANPAGES%%share/man/man1/mergecap.1.gz
+%%MANPAGES%%%%MAXMIND%%share/man/man1/mmdbresolve.1.gz
+%%MANPAGES%%share/man/man1/randpkt.1.gz
+%%MANPAGES%%share/man/man1/randpktdump.1.gz
+%%MANPAGES%%share/man/man1/rawshark.1.gz
+%%MANPAGES%%share/man/man1/reordercap.1.gz
+%%MANPAGES%%%%LIBSSH%%share/man/man1/sshdump.1.gz
+%%MANPAGES%%share/man/man1/text2pcap.1.gz
+%%MANPAGES%%share/man/man1/tshark.1.gz
+%%MANPAGES%%share/man/man1/udpdump.1.gz
+%%MANPAGES%%%%LIBSSH%%share/man/man1/wifidump.1.gz
+%%MANPAGES%%%%GUI%%share/man/man1/wireshark.1.gz
+%%MANPAGES%%share/man/man4/extcap.4.gz
+%%MANPAGES%%share/man/man4/wireshark-filter.4.gz
 %%GUI%%share/applications/org.wireshark.Wireshark.desktop
 %%GUI%%share/icons/hicolor/128x128/apps/org.wireshark.Wireshark.png
 %%GUI%%share/icons/hicolor/128x128/mimetypes/org.wireshark.Wireshark-mimetype.png
@@ -735,19 +736,19 @@ share/man/man4/wireshark-filter.4.gz
 %%GUI%%share/icons/hicolor/scalable/apps/org.wireshark.Wireshark.svg
 %%GUI%%share/metainfo/org.wireshark.Wireshark.metainfo.xml
 %%GUI%%share/mime/packages/org.wireshark.Wireshark.xml
-%%DATADIR%%/AUTHORS-SHORT
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/AUTHORS-SHORT
 %%DATADIR%%/Acknowledgements.md
 %%DATADIR%%/COPYING
-%%DATADIR%%/androiddump.html
-%%DATADIR%%/capinfos.html
-%%DATADIR%%/captype.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/androiddump.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/capinfos.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/captype.html
 %%DATADIR%%/cfilters
-%%DATADIR%%/ciscodump.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/ciscodump.html
 %%DATADIR%%/colorfilters
 %%LUA%%%%DATADIR%%/console.lua
 %%DATADIR%%/dfilters
 %%DATADIR%%/dfilter_macros
-%%DATADIR%%/dftest.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/dftest.html
 %%LUA%%%%DATADIR%%/dtd_gen.lua
 %%DATADIR%%/diameter/AlcatelLucent.xml
 %%DATADIR%%/diameter/Cisco.xml
@@ -792,17 +793,17 @@ share/man/man4/wireshark-filter.4.gz
 %%DATADIR%%/dtds/watcherinfo.dtd
 %%DATADIR%%/dtds/xcap-caps.dtd
 %%DATADIR%%/dtds/xcap-error.dtd
-%%DATADIR%%/dumpcap.html
-%%DATADIR%%/editcap.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/dumpcap.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/editcap.html
 %%DATADIR%%/enterprises.tsv
-%%DATADIR%%/etwdump.html
-%%DATADIR%%/extcap.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/etwdump.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/extcap.html
 %%DATADIR%%/gpl-2.0-standalone.html
 %%LUA%%%%DATADIR%%/init.lua
 %%DATADIR%%/ipmap.html
 %%DATADIR%%/manuf
-%%DATADIR%%/mergecap.html
-%%MAXMIND%%%%DATADIR%%/mmdbresolve.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/mergecap.html
+%%MANPAGES%%%%DOCS%%%%MAXMIND%%%%DATADIR%%/mmdbresolve.html
 %%DATADIR%%/pdml2html.xsl
 %%DATADIR%%/profiles/Bluetooth/colorfilters
 %%DATADIR%%/profiles/Bluetooth/preferences
@@ -1017,21 +1018,21 @@ share/man/man4/wireshark-filter.4.gz
 %%DATADIR%%/radius/dictionary.zeus
 %%DATADIR%%/radius/dictionary.zte
 %%DATADIR%%/radius/dictionary.zyxel
-%%DATADIR%%/randpkt.html
-%%DATADIR%%/randpktdump.html
-%%DATADIR%%/rawshark.html
-%%DATADIR%%/reordercap.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/randpkt.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/randpktdump.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/rawshark.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/reordercap.html
 %%DATADIR%%/services
 %%DATADIR%%/smi_modules
-%%DATADIR%%/sshdump.html
-%%DATADIR%%/text2pcap.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/sshdump.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/text2pcap.html
 %%DATADIR%%/tpncp/tpncp.dat
-%%DATADIR%%/tshark.html
-%%DATADIR%%/udpdump.html
-%%DATADIR%%/wifidump.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/tshark.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/udpdump.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/wifidump.html
 %%DATADIR%%/wimaxasncp/dictionary.dtd
 %%DATADIR%%/wimaxasncp/dictionary.xml
-%%DATADIR%%/wireshark-filter.html
-%%DATADIR%%/wireshark.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/wireshark-filter.html
+%%MANPAGES%%%%DOCS%%%%DATADIR%%/wireshark.html
 %%DATADIR%%/wka
 %%DATADIR%%/ws.css