From nobody Mon Mar 20 08:40:54 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pg7VZ30Vvz40R5h; Mon, 20 Mar 2023 08:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pg7VZ2XkWz49S9; Mon, 20 Mar 2023 08:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679301654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kh0Czqvky8G24F4btjfw95QCrUGtknRQWCFoEYNC7VU=; b=OAKKMOIocCa9H2+ejeIMD+55p3DdE6LT0EdVyxD/jPkgDPcUm0xHq/21YPXnnb8dy9LwRU 0kNE76BhJjZRHczwU8leKd6K5UZlEEZEyuVMbqQ8WfRFmGHz3ZvVTS4Z0AKUTk6+1D7J0t MdnCOtyAeuNY2OIFVEKMfTwE3UbQNaRtBEymS1vE5Ps/IfYMky/LsQEFobKZBieuAZUfYT TTsxMAmMrSKiSSz60xsGyxIKtBfXGXenQFiFQpftojRQbBcKAOCdjpJy8J0VGee96Bg5fw +0WDyyHIjyQXXuABYyuGPGZnKUIdLv5wQ4aFmPD326ukt5wR4L6CrmEXp9nJSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679301654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kh0Czqvky8G24F4btjfw95QCrUGtknRQWCFoEYNC7VU=; b=Q966K8F4AZM6l3xyfLApaK0fJIe3x+fOHIb9Ba5uScsHsnP6EyTRUNDZWNJd0PJOuLCcE8 chSrhDgH+CrzPHywDCaxYpO5NHv0ZX1+su8wJXZlyJjaeyZLIR5VcWu6nAYejRSIiz6w7Q tLXgXgi6szulu9oW3KlyTh3qPlzKgp+MY9D2zc8T3xxF+Fe76Yi4fJbKajibDiwPfj0d7y TK6/w21p0Scl+YLy/4Cfasn/MRwQ/cFSfuIjQ5hoeKgWV9z3zTulhyTffru9OIagos8jlK Ni0F4GqY7HtY2NT7TBU4h02rRiicRLD4zd2D5/kLkln+0rvgvQgwWkib1a2q5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679301654; a=rsa-sha256; cv=none; b=cggO4nRpcpll7zFyfVxbD1oUHvn58LDfRBCw1IQDZL/hFwepi+yeKkefP7yrqoOLZfnY71 MdPsEDHHcHoZ6OXsghsYtUXFdxrU74WB0CGVDoKV1r5EmLQ2a5R1QwxnPr/Un60FDFNkMH HlIASHuZJ7a0LeAmplc3+BV/Wxbfo8BKWB11beZSuMhYn6anDABuR/esW2IRclEWsiB41a B/MMydkixxyHIWACqAmTlxCYVVvSeIgBpajAOtfWuEI9Kl3A1JQALMq98HBGNTzOppeQD5 JjWZ1z7hVk2xqVl1QjHXsDE4mQD/3Fymj08WyTid7gLmKmwxfKRoztvO3jiHmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pg7VZ1bhvzNX0; Mon, 20 Mar 2023 08:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32K8esQK092046; Mon, 20 Mar 2023 08:40:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K8esEQ092045; Mon, 20 Mar 2023 08:40:54 GMT (envelope-from git) Date: Mon, 20 Mar 2023 08:40:54 GMT Message-Id: <202303200840.32K8esEQ092045@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: 55c08bfbb77e - main - net/wireshark: Rework ANDROIDDUMP List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55c08bfbb77e1bebd6594b8c38914b431a913a44 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=55c08bfbb77e1bebd6594b8c38914b431a913a44 commit 55c08bfbb77e1bebd6594b8c38914b431a913a44 Author: Daniel Engberg AuthorDate: 2023-03-20 08:40:03 +0000 Commit: Joe Marcus Clarke 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' \