Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Mar 2024 13:19:49 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6d40b48ea874 - main - net-mgmt/icinga2: Move man pages to share/man
Message-ID:  <202403201319.42KDJn8v000721@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

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

commit 6d40b48ea874e6892183b7b28ffd3b803b4bee77
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-03-20 12:04:52 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-03-20 13:19:31 +0000

    net-mgmt/icinga2: Move man pages to share/man
    
    Approved by:    portmgr (blanket)
---
 net-mgmt/icinga2/Makefile                            |  3 ++-
 .../patch-third-party_cmake_GNUInstallDirs.cmake     | 20 ++++++++++++++++++++
 net-mgmt/icinga2/pkg-plist                           |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index 0804d224d13d..f14568eee344 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.14.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	joneum@FreeBSD.org
@@ -53,6 +53,7 @@ CMAKE_ARGS+=	-DCMAKE_EXE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
 		-DCMAKE_MODULE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
 		-DCMAKE_SHARED_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
 		-DCMAKE_STATIC_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
+		-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man \
 		-DICINGA2_COMMAND_GROUP=${ICINGA2USER} \
 		-DICINGA2_COMMAND_USER=${ICINGA2USER} \
 		-DICINGA2_GROUP=${ICINGA2GROUP} \
diff --git a/net-mgmt/icinga2/files/patch-third-party_cmake_GNUInstallDirs.cmake b/net-mgmt/icinga2/files/patch-third-party_cmake_GNUInstallDirs.cmake
new file mode 100644
index 000000000000..03246563e110
--- /dev/null
+++ b/net-mgmt/icinga2/files/patch-third-party_cmake_GNUInstallDirs.cmake
@@ -0,0 +1,20 @@
+--- third-party/cmake/GNUInstallDirs.cmake.orig	2024-03-20 11:52:57 UTC
++++ third-party/cmake/GNUInstallDirs.cmake
+@@ -172,7 +172,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "(DragonFly|FreeBSD|OpenB
+     set(CMAKE_INSTALL_INFODIR "info")
+   endif()
+ 
+-  if(NOT CMAKE_INSTALL_MANDDIR)
++  if(NOT CMAKE_INSTALL_MANDIR)
+     set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (man)")
+     set(CMAKE_INSTALL_MANDIR "man")
+   endif()
+@@ -182,7 +182,7 @@ else()
+     set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
+   endif()
+ 
+-  if(NOT CMAKE_INSTALL_MANDDIR)
++  if(NOT CMAKE_INSTALL_MANDIR)
+     set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
+     set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
+   endif()
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index bccdef613621..d505da2e1544 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -43,7 +43,6 @@ etc/bash_completion.d/icinga2
 %%PGSQL%%lib/icinga2/libpgsql_shim.so.2.14.2
 lib/icinga2/sbin/icinga2
 libexec/nagios/check_nscp_api
-man/man8/icinga2.8.gz
 sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
@@ -178,6 +177,7 @@ sbin/icinga2
 %%DATADIR%%/include/plugins-contrib.d/vmware.conf
 %%DATADIR%%/include/plugins-contrib.d/web.conf
 %%DATADIR%%/include/windows-plugins
+share/man/man8/icinga2.8.gz
 share/vim/vimfiles/ftdetect/icinga2.vim
 share/vim/vimfiles/syntax/icinga2.vim
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) %%ETCDIR%%



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