Date: Tue, 11 Oct 2022 18:45:02 GMT From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 216a9441993d - main - net/wireshark: Fix patching of the -lite ports Message-ID: <202210111845.29BIj2LE061567@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=216a9441993d91410c3428eca12cd3fc675182ff commit 216a9441993d91410c3428eca12cd3fc675182ff Author: Joe Marcus Clarke <marcus@FreeBSD.org> AuthorDate: 2022-10-11 18:44:08 +0000 Commit: Joe Marcus Clarke <marcus@FreeBSD.org> 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210111845.29BIj2LE061567>