From nobody Wed Mar 20 13:19:49 2024 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 4V08MV3XDzz5FXST; Wed, 20 Mar 2024 13:19:50 +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 4V08MV03YWz4s5J; Wed, 20 Mar 2024 13:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710940790; 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=qBnPNNvyPYQbsSCgpfpnLDB+RcUx11Ax5OlsX3C/bCU=; b=Y8mU/X+Sm//ILggYPnh/XIvswEkq1oRTnL02WYNBvXZCSPH6yi0cOSyNEUFdzolSPxfZ4g 2F2lJIKDnVNbwLHHX2bdPQNkCpe2SdZ6XRgXAeL+mB6psvmFKWClUg+7c59Tu/qTGbPpvb R5kchbvn+5TdQZ+2XHV9Sk0BbWRLBK65pOsyDXK+LZkXbRPCYprPP7XsbKLkEuTO4RfBGs lCglsEDzZgzHp88/sYBUsgsbnZRiQ9zKzqiM0oBz1HW9yU5LQYjZmKhgXMrA6y8Ptgtp7V Pr8P/xZsirqZathVOyhOnT5Tz+flQuQYOM1vjt300qp6do4ZM66oj7GL/0/d6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710940790; a=rsa-sha256; cv=none; b=oL3w9I9CvkK2j7U4J2I5tOaIdLUVdzJJT5M1hbXkSokDEAG0+FWMy/E3VBT4DqsMddrZtR VDU9TbpsJcEObfXNvl/rxjPoWfH8Hnv0CuGSG8YDFcFXjOhWuaE9TG0OsJTWrsSZlVRQqg 4+8wz4g4MYu3/VZvmeAEFLYNaukrHUIqgWzgQpogq4xPxpuIEv+PNGjw8HMRLbJvmRR66W U65QqdzW0bt1ERVPdcZ535AeEAxRFOwMencPdmbcoo9icApQqvorZ3fO2R7qiQHs22JSyI +Es7sVY0AUwOOalA6XrJ0b4C7VN8afdeJD91F9Id1s7ScGT8PNrpTDn3Ll7twQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710940790; 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=qBnPNNvyPYQbsSCgpfpnLDB+RcUx11Ax5OlsX3C/bCU=; b=x3VXfxQyka6CUb3oX75hDrbLtZezaFB6DrOmauSJhq68mbT3etuqNEQOElFp2h8gz2PoBA 4041S2r6p06Ih2fe/zdWh99duCa9WacxMw6X36oLpQWww+IEjWXVoLMrw6kSMYZObo+Tg0 xsly1n5LZl1tqjk1MUZB7mXYgoHlPbXWePtcAqg8A4apb6u7hgNY2vPLR+ZB8aBjOMbq55 u0fTmtNw1kBMl6GmZ7XN9m65Ynpv6XecOINDudCFnRWzIzw5afIoGqaq/Kp9oBdeu84JVR hBIYR0n99CfD5/jHRbi23nOinxj61wm75GK6ZhXRbFi0BHVZqRyiDjRI5Su7rQ== 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 4V08MT6m0Qzsly; Wed, 20 Mar 2024 13:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42KDJnV6000724; Wed, 20 Mar 2024 13:19:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KDJn8v000721; Wed, 20 Mar 2024 13:19:49 GMT (envelope-from git) Date: Wed, 20 Mar 2024 13:19:49 GMT Message-Id: <202403201319.42KDJn8v000721@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 6d40b48ea874 - main - net-mgmt/icinga2: Move man pages to share/man 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d40b48ea874e6892183b7b28ffd3b803b4bee77 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d40b48ea874e6892183b7b28ffd3b803b4bee77 commit 6d40b48ea874e6892183b7b28ffd3b803b4bee77 Author: Nuno Teixeira AuthorDate: 2024-03-20 12:04:52 +0000 Commit: Nuno Teixeira 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%%