git: ed01d8084556 - main - net/wireshark: Restore ANDROIDDUMP OPTION

The branch main has been updated by marcus:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ed01d8084556dd08f9ebae54985bbe053da0129c

commit ed01d8084556dd08f9ebae54985bbe053da0129c
Author:     Joe Marcus Clarke <marcus@FreeBSD.org>
AuthorDate: 2023-03-11 20:32:39 +0000
Commit:     Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2023-03-11 20:32:39 +0000

    net/wireshark: Restore ANDROIDDUMP OPTION
    
    If you have TCP blackhole enabled, having androiddump built adds ~ 70
    seconds to wireshark's start time (if you don't have the Android
    Debugger running).
    
    Leave this OPTION default enabled as it doesn't introduce any other
    dependencies.
    
    Reported by:    Boris Korzun <drtr0jan@yandex.ru>
---
 net/wireshark/Makefile  | 17 ++++++++++++++---
 net/wireshark/pkg-plist |  4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index c52b81693a32..f2d67443c073 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -43,26 +43,31 @@ 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
+OPTIONS_DEFINE=		ANDROIDDUMP 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=	ANDROIDDUMP 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
 
+ANDROIDDUMP_DESC=	Build androiddump extcap tool
 GNUTLS_DESC=		Enable crypto support for SSL and IPSec via GnuTLS
 GUI_DESC=		Enable Qt 5 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)
 
+ANDROIDDUMP_CMAKE_ON=-DBUILD_androiddump=ON
+ANDROIDDUMP_CMAKE_OFF=-DBUILD_androiddump=OFF
+
 DOCS_IMPLIES=		MANPAGES
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
@@ -111,6 +116,12 @@ IGNORE=			cannot build with base Kerberos if krb5 port is installed. \
 			Use ``make config'' to choose a different option
 .endif
 
+.if ${PORT_OPTIONS:MANDROIDDUMP}
+PLIST_SUB+=	ANDROIDDUMP=""
+.else
+PLIST_SUB+=	ANDROIDDUMP="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/applications|${DESKTOPDIR}|g ; \
 		s|/usr/share|${LOCALBASE}/share|g' \
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 721f7865c5cf..e84e2dd21c2d 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -670,7 +670,7 @@ lib/wireshark/cmake/WiresharkConfig.cmake
 lib/wireshark/cmake/WiresharkConfigVersion.cmake
 lib/wireshark/cmake/WiresharkTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/wireshark/cmake/WiresharkTargets.cmake
-lib/wireshark/extcap/androiddump
+%%ANDROIDDUMP%%lib/wireshark/extcap/androiddump
 %%LIBSSH%%lib/wireshark/extcap/ciscodump
 lib/wireshark/extcap/randpktdump
 %%LIBSSH%%lib/wireshark/extcap/sshdump
@@ -696,7 +696,7 @@ 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
-%%MANPAGES%%share/man/man1/androiddump.1.gz
+%%ANDROIDDUMP%%%%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