git: 55c08bfbb77e - main - net/wireshark: Rework ANDROIDDUMP
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 20 Mar 2023 08:40:54 UTC
The branch main has been updated by marcus:
URL: https://cgit.FreeBSD.org/ports/commit/?id=55c08bfbb77e1bebd6594b8c38914b431a913a44
commit 55c08bfbb77e1bebd6594b8c38914b431a913a44
Author: Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-03-20 08:40:03 +0000
Commit: Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2023-03-20 08:40:03 +0000
net/wireshark: Rework ANDROIDDUMP
Use the cmake Bool helper and remove redundant code now that we're not
using individual _MAN and _LIB subs.
PR: 270160
---
net/wireshark/Makefile | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index f2d67443c073..c99c79f8c3d6 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -65,8 +65,7 @@ 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
+ANDROIDDUMP_CMAKE_BOOL= BUILD_androiddump
DOCS_IMPLIES= MANPAGES
@@ -116,12 +115,6 @@ 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' \