Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Jan 2024 18:07:48 GMT
From:      Craig Leres <leres@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: a994b94824a0 - 2024Q1 - security/zeek: Install man pages in share/man
Message-ID:  <202401221807.40MI7mJs076378@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by leres:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a994b94824a006f3d13a6f26337c1b07d1a9a150

commit a994b94824a006f3d13a6f26337c1b07d1a9a150
Author:     Craig Leres <leres@FreeBSD.org>
AuthorDate: 2024-01-21 23:16:25 +0000
Commit:     Craig Leres <leres@FreeBSD.org>
CommitDate: 2024-01-22 18:07:32 +0000

    security/zeek: Install man pages in share/man
    
    (cherry picked from commit 59df11ec848a3484847a14a7e0f3649c5694d70b)
---
 security/zeek/Makefile  |  3 ++-
 security/zeek/pkg-plist | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/security/zeek/Makefile b/security/zeek/Makefile
index d4c13b1e3da8..405449af4620 100644
--- a/security/zeek/Makefile
+++ b/security/zeek/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	zeek
 DISTVERSION=	6.0.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://download.zeek.org/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -42,7 +43,7 @@ CMAKE_ARGS=	-DCARES_ROOT_DIR:PATH=${PREFIX} \
 		-DINSTALL_ZKG:BOOL=OFF \
 		-DPY_MOD_INSTALL_DIR:PATH=${PREFIX}/lib/zeekctl \
 		-DZEEK_ETC_INSTALL_DIR:PATH=${PREFIX}/etc \
-		-DZEEK_MAN_INSTALL_PATH=${MANPREFIX}/man \
+		-DZEEK_MAN_INSTALL_PATH=${MANPREFIX}/share/man \
 		-DZEEK_ROOT_DIR:PATH=${PREFIX} \
 		-DZEEK_SCRIPT_INSTALL_PATH:PATH=${PREFIX}/share/zeek
 
diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist
index 94a224c990f7..d7c06b5f6092 100644
--- a/security/zeek/pkg-plist
+++ b/security/zeek/pkg-plist
@@ -1283,10 +1283,6 @@ lib/zeek/python/zeekctl/plugins/lb_pf_ring.py
 lib/zeek/python/zeekctl/plugins/ps.py
 lib/zeek/python/zeekctl/plugins/zeek_port_warning.py
 lib/zeek/python/zeekctl/plugins/zzz_af_packet.py
-%%ZEEKCTL%%man/man1/trace-summary.1.gz
-man/man1/zeek-cut.1.gz
-man/man8/zeek.8.gz
-%%ZEEKCTL%%man/man8/zeekctl.8.gz
 share/btest/data/Scripts/README
 share/btest/data/Scripts/canonify-zeek-log
 share/btest/data/Scripts/canonify-zeek-log-sorted
@@ -1320,6 +1316,10 @@ share/btest/scripts/spicy/diff-remove-abspath
 share/btest/scripts/spicy/diff-remove-timestamps
 share/btest/scripts/spicy/diff-sort
 %%SPICY%%share/hilti/hilti.hlt
+%%ZEEKCTL%%share/man/man1/trace-summary.1.gz
+share/man/man1/zeek-cut.1.gz
+share/man/man8/zeek.8.gz
+%%ZEEKCTL%%share/man/man8/zeekctl.8.gz
 %%SPICY%%share/spicy/filter.spicy
 %%SPICY%%share/spicy/spicy-driver-host.cc
 %%SPICY%%share/spicy/spicy.spicy
@@ -2099,6 +2099,9 @@ share/btest/scripts/spicy/diff-sort
 %%ZEEKCTL%%@dir spool/installed-scripts-do-not-touch
 %%ZEEKCTL%%@dir spool/brokerstore
 %%ZEEKCTL%%@dir spool
+@dir share/man/man8
+@dir share/man/man1
+@dir share/man
 %%ZEEKCTL%%@dir logs
 %%SPICY%%@dir lib/zeek/spicy
 @dir lib/zeek/plugins



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401221807.40MI7mJs076378>