Attachment 237171 Details for Bug 266922 – Fix wireshark under poudriere

[patch] Fix wireshark under poudriere

fix-wireshark.diff (text/plain), 2.65 KB, created by Cy Schubert on 2022-10-09 20:51:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2022-10-09 20:51:44 UTC

Size: 2.65 KB

patch

obsolete

>diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
>index 51dca2c698cc..b573c2175b23 100644
>--- a/net/wireshark/Makefile
>+++ b/net/wireshark/Makefile
>@@ -42,7 +42,7 @@ LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error \
> #CFLAGS+=	-funit-at-a-time
> 
> .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
>-    reordercap captype randpktdump udpdump sharkd etwdump wifidump
>+    reordercap captype randpktdump udpdump sharkd etwdump
> .if defined(LITE)
> PKGNAMESUFFIX=		-lite
> PLIST_SUB+=		${x:tu}="@comment $x not installed" \
>@@ -50,7 +50,7 @@ PLIST_SUB+=		${x:tu}="@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
>+OPTIONS_EXCLUDE+=	RTP SNMP LUA ANDROIDDUMP CISCODUMP SSHDUMP WIFIDUMP
> .else
> PLIST_SUB+=		${x:tu}=bin/$x \
> 			${x:tu}_MAN="" \
>@@ -58,7 +58,7 @@ PLIST_SUB+=		${x:tu}=bin/$x \
> .endif
> .endfor
> 
>-OPTIONS_DEFINE=		GUI RTP SNMP MAXMIND LTO LUA DECRYPT ANDROIDDUMP SSHDUMP CISCODUMP OPUS
>+OPTIONS_DEFINE=		GUI RTP SNMP MAXMIND LTO LUA DECRYPT ANDROIDDUMP SSHDUMP CISCODUMP WIFIDUMP OPUS
> 
> OPTIONS_SINGLE=		GSSAPI
> 
>@@ -78,6 +78,7 @@ 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
>+WIFIDUMP_DESC=		Build wifidump extcap tool
> OPUS_DESC=		Build opus decoder plugin
> 
> GUI_USES=		qt:5
>@@ -116,6 +117,8 @@ SSHDUMP_CMAKE_ON=-DBUILD_sshdump=ON
> SSHDUMP_CMAKE_OFF=-DBUILD_sshdump=OFF
> CISCODUMP_CMAKE_ON=-DBUILD_ciscodump=ON
> CISCODUMP_CMAKE_OFF=-DBUILD_ciscodump=OFF
>+WIFIDUMP_CMAKE_ON=-DBUILD_wifidump=ON
>+WIFIDUMP_CMAKE_OFF=-DBUILD_wifidump=OFF
> OPUS_CMAKE_ON=	-DENABLE_OPUS=ON
> OPUS_CMAKE_OFF=	-DENABLE_OPUS=OFF
> 
>@@ -130,6 +133,7 @@ OPTIONS_SUB=		yes
> CMAKE_ARGS+=	-DBUILD_androiddump=OFF \
> 		-DBUILD_sshdump=OFF \
> 		-DBUILD_ciscodump=OFF \
>+		-DBUILD_wifidump=OFF \
> 		-DENABLE_OPUS=OFF
> PLIST_SUB+=	ANDROIDDUMP_LIB="@comment " \
> 		ANDROIDDUMP_MAN="@comment " \
>@@ -137,6 +141,8 @@ PLIST_SUB+=	ANDROIDDUMP_LIB="@comment " \
> 		SSHDUMP_MAN="@comment " \
> 		CISCODUMP_LIB="@comment " \
> 		CISCODUMP_MAN="@comment " \
>+		WIFIDUMP_LIB="@comment " \
>+		WIFIDUMP_MAN="@comment " \
> 		OPUS="@comment "
> .endif
> 
>@@ -178,6 +184,13 @@ PLIST_SUB+=	CISCODUMP_LIB="" \
> PLIST_SUB+=	CISCODUMP_LIB="@comment " \
> 		CISCODUMP_MAN="@comment "
> .endif
>+.if ${PORT_OPTIONS:MWIFIDUMP}
>+PLIST_SUB+=	WIFIDUMP_LIB="" \
>+		WIFIDUMP_MAN=""
>+.else
>+PLIST_SUB+=	WIFIDUMP_LIB="@comment " \
>+		WIFIDUMP_MAN="@comment "
>+.endif
> .if ${PORT_OPTIONS:MOPUS}
> PLIST_SUB+=	OPUS=""
> .else

Actions: View | Diff

Attachments on bug 266922: 237171