From nobody Tue Oct 11 18:45:02 2022 X-Original-To: dev-commits-ports-all@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 4Mn4TW2TTGz4f9t6; Tue, 11 Oct 2022 18:45:03 +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 4Mn4TW1vbRz3KKf; Tue, 11 Oct 2022 18:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665513903; 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=T1et6AgXKsUCVlSNMX9+/BjkhmTzJR5nranICnVf38I=; b=NmQhj2ZRUr15XZHVIttI/yr03o7aRK9Y8dkh8+wceyupYCJr+zOIOVEpNIWRFGCghFy+3I gig2lp6uCjhAwRm74FbFeWOJ2DXW42sYOsI8MRVz2H2ARA2+yfGqBf1jjIgSbdUTzoxxEN 0sIy0o78nTJwOvzxr/ICFShesakgaDc1uGKTx2f07uTOJIrbvthvmSxZi0VRAucvpKBb4E Sajnpe091/lcJw+fDNAaU51noHdvd2X62osrQ7k/ozjyZ+L+If5Vxh0ipQ0PS9Y0jj7Xo0 xAeZS+lpJ6O7Mqku8YCwYAWkvAcfAP6yfDJPw5WTG1aqDgRgZ5JkUCaKXTxgLw== 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 4Mn4TW0jB7z13R8; Tue, 11 Oct 2022 18:45:03 +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 29BIj26P061568; Tue, 11 Oct 2022 18:45:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29BIj2LE061567; Tue, 11 Oct 2022 18:45:02 GMT (envelope-from git) Date: Tue, 11 Oct 2022 18:45:02 GMT Message-Id: <202210111845.29BIj2LE061567@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: 216a9441993d - main - net/wireshark: Fix patching of the -lite ports List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 216a9441993d91410c3428eca12cd3fc675182ff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665513903; 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=T1et6AgXKsUCVlSNMX9+/BjkhmTzJR5nranICnVf38I=; b=o3O2gOO4VQx7JcMSHxhlvwWU8ajpCfTNiZ6fgen9MCF6q2eSIeLrDzYSeKjeePEdw/yZp8 LACf59vOKPLTKVKL/yqs5EsQa6K+OP0Zhr11lszvIwnb8r3wnAA8EZe+OoTF7rL7qgA5rd RcgvcVqAQT7VCPBru1NYbP3DrR002rb1RmnyoSCr7+uQvWYiSTUN+8kCaTs5sWrtRVuNdV IpKX9f8YqtyNjWYe47Z1vEe+t84w0JJEjtX1hncI0Bt1Tvd1xt4PeEd3mc1Xv9Ld49maji 5h2wxZyJpYrYxQeEnidUJ0sEcMdQn6EP5P+SDt24Sut/Uvorp7IWZ6UvPOtydQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665513903; a=rsa-sha256; cv=none; b=ImXRwKHwGNxNfdWuW5hgKYA8H2W2yQuPSvPRtQvoCJbbafryLWPyS3J4EgTs35m5x3nkFf AqMm4tVM6dxWCzXGSEgryz3U/O6YdexD96KUCRkOFpLygf5RxdMaXPmTJzv2gMRKUXRx2r hCIkYXDt0H1XfqZzat5e20w0GhaJL8Ce/iOSZeR7CeIys6xqUYBDx03JcZDW5BVV+HXzfG 4xMOUN2T+ZZJkmhKYSmhZOVF2rjOyxPmICp5DCNKbECQ128+AA6OlZAsfom1xcEKokxmqb TnmhzHv580N96H6R1A8UVFpBFJxt4RywwB2CkiKQucvB15UJh1dAqyl+bwbopg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=216a9441993d91410c3428eca12cd3fc675182ff commit 216a9441993d91410c3428eca12cd3fc675182ff Author: Joe Marcus Clarke AuthorDate: 2022-10-11 18:44:08 +0000 Commit: Joe Marcus Clarke CommitDate: 2022-10-11 18:44:08 +0000 net/wireshark: Fix patching of the -lite ports PR: 266964 --- net/wireshark/files/extra-patch-doc_CMakeLists.txt | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/net/wireshark/files/extra-patch-doc_CMakeLists.txt b/net/wireshark/files/extra-patch-doc_CMakeLists.txt index e38b0b77bd57..c5f7eb0d9a7e 100644 --- a/net/wireshark/files/extra-patch-doc_CMakeLists.txt +++ b/net/wireshark/files/extra-patch-doc_CMakeLists.txt @@ -1,23 +1,22 @@ ---- doc/CMakeLists.txt.orig 2021-11-25 07:35:42.282939000 -0500 -+++ doc/CMakeLists.txt 2021-11-25 07:38:48.263204000 -0500 -@@ -42,24 +42,39 @@ macro (ADD_MAN_PAGE _page_name _man_section) +--- doc/CMakeLists.txt.orig 2022-10-11 14:38:02.853482000 -0400 ++++ doc/CMakeLists.txt 2022-10-11 14:39:14.016917000 -0400 +@@ -42,25 +42,39 @@ macro (ADD_MAN_PAGE _page_name _man_section) endif() endmacro() +macro (ADD_MAN_PAGE_NO_INSTALL _page_name _man_section) -+ if(ASCIIDOCTOR_FOUND) -+ list(APPEND HTML_INSTALL_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_page_name}.html) ++ if(ASCIIDOCTOR_FOUND) ++ list(APPEND HTML_INSTALL_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_page_name}.html) + -+ if (${_man_section} EQUAL 1) -+ list(APPEND MAN1_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_page_name}.adoc) -+ elseif (${_man_section} EQUAL 4) -+ list(APPEND MAN4_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_page_name}.adoc) -+ else() -+ message(FATAL_ERROR "Unsupported manual page section ${_man_section} for ${_page_name}") -+ endif() -+ endif() ++ if (${_man_section} EQUAL 1) ++ list(APPEND MAN1_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_page_name}.adoc) ++ elseif (${_man_section} EQUAL 4) ++ list(APPEND MAN4_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_page_name}.adoc) ++ else() ++ message(FATAL_ERROR "Unsupported manual page section ${_man_section} for ${_page_name}") ++ endif() ++ endif() +endmacro() -+ + ADD_MAN_PAGE(wireshark 1) -ADD_MAN_PAGE(androiddump 1) @@ -51,7 +50,9 @@ +ADD_MAN_PAGE_NO_INSTALL(text2pcap 1) ADD_MAN_PAGE(tshark 1) -ADD_MAN_PAGE(udpdump 1) +-ADD_MAN_PAGE(wifidump 1) +ADD_MAN_PAGE_NO_INSTALL(udpdump 1) ++ADD_MAN_PAGE_NO_INSTALL(wifidump 1) ADD_MAN_PAGE(extcap 4) ADD_MAN_PAGE(wireshark-filter 4)