From nobody Wed Mar 6 19:50:50 2024 X-Original-To: dev-commits-ports-main@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 4Tqjj66tr0z5DBtd; Wed, 6 Mar 2024 19:50: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 4Tqjj66P1zz49xS; Wed, 6 Mar 2024 19:50:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709754650; 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=Ff+5pJbkbyZB52ko26FahqJ1m6bk5XFzOEKg1LbTplM=; b=WZg3gbUjoTBdx1zE9JhUCdbtidFD+2DHTGHvGaQPYcWdVH5vtX1BHGXlltfDmInDwz1lF8 cT+EjbpJl7XpsHL1Ajekk8gTfCsz2APm3zdvK69RhfbjWVgvo8Wzy4giEa+1tieuSmUsEx EN5c3qwQFqJQxtYQt9YMDW6yJ3VG6VnZ4MPJuhejWqroY7rH2pBwA8w7PvwjNWhnrsmVYV QnKdC0Oh16vW5nx5EaKl1sIYhvQgsDY9Y4BmmAxAgQFKzp277hYFJcuPqzlIB0i9hFDjAy 69qrOwwwAHW0fs6YhzBAkUVpWbzfEewcVCBuefwfMvzf5Lb2ExN+1EzayDziEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709754650; a=rsa-sha256; cv=none; b=vigoL+3IbUyJzQU06wBj/Qclr7x8ILRX7ZOmCTJDaoG97whs9PaUyRQDAEQbk+GzEbPhd+ +fd1rlzsZ98K/XemWuRH+nx/gaNSuA6ixlNww6gMm1+Gk48DtA3cLUr1DmTeNaKng+So1Y Sl3Tr8rR521ai6QfjEdT/JPKJaDiRwIskfO0UzPf9tjtIXRniQiT0CYY91ML9O3sgNmZ1X lYQDjaKAepGfQClop1TU6T3FKanqwTqKi9qaeSQYbJ54Oi5UOWXAshQF1ZT45vZbGOPKXq 5W2dFS8HYEY6aGSMmngflNaJaxtttBlOjXKA3p9VUNLjRLSCx5jEx33ykcEqrA== 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=1709754650; 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=Ff+5pJbkbyZB52ko26FahqJ1m6bk5XFzOEKg1LbTplM=; b=lX7yUDj5gFG1g23aWt/ihY6tMfd07005xezTLmfQFdEcqVD7TbyKQbtGPEk7485KH6mJre 7Wwt+t5dNNz6vfFa/6db1WA0mZ27aI4c/twU2Gtcj98JrhN96rDwuNQiv3jgu8SEH4j81O PL5+03pIRSNC4KWD/r1QVs9LI7hgelArmoCSd7hHFavgNUaJxLVPAc9zbSiQjATDAOAPUH YuZmpYuqniUpcm3hEFsLoK6vpvzNCoolHPZUKIKDzgKLk0SQY8VePwVnGtF8Dh++ituPyR u+VELHLxlLqzFRWcqk6NtVMsnREx0C8j42JNvQwliqDkYTmskdXRry5wyyi5SQ== 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 4Tqjj660Hrz13nN; Wed, 6 Mar 2024 19:50:50 +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 426Joori073909; Wed, 6 Mar 2024 19:50:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426JooIl073906; Wed, 6 Mar 2024 19:50:50 GMT (envelope-from git) Date: Wed, 6 Mar 2024 19:50:50 GMT Message-Id: <202403061950.426JooIl073906@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: e82be126dbc0 - main - sysutils/munin-*: Move man pages to share/man List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e82be126dbc0f0f66d2af2d6f752cfe861e49dbc Auto-Submitted: auto-generated The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=e82be126dbc0f0f66d2af2d6f752cfe861e49dbc commit e82be126dbc0f0f66d2af2d6f752cfe861e49dbc Author: Florian Smeets AuthorDate: 2024-03-06 19:48:12 +0000 Commit: Florian Smeets CommitDate: 2024-03-06 19:50:44 +0000 sysutils/munin-*: Move man pages to share/man --- sysutils/munin-common/Makefile | 1 + sysutils/munin-common/munin.mk | 1 + sysutils/munin-common/pkg-plist | 14 +++++++------- sysutils/munin-master/Makefile | 5 +++-- sysutils/munin-master/pkg-plist | 38 +++++++++++++++++++------------------- sysutils/munin-node/Makefile | 3 +-- 6 files changed, 32 insertions(+), 30 deletions(-) diff --git a/sysutils/munin-common/Makefile b/sysutils/munin-common/Makefile index 396798339354..127e09eb9f8d 100644 --- a/sysutils/munin-common/Makefile +++ b/sysutils/munin-common/Makefile @@ -1,5 +1,6 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils perl5 PKGNAMESUFFIX= -common diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk index d2850e847c2f..7a48b9fdc190 100644 --- a/sysutils/munin-common/munin.mk +++ b/sysutils/munin-common/munin.mk @@ -22,6 +22,7 @@ MUNIN_DIRS= BINDIR=${PREFIX}/bin \ HTMLDIR=${WWWDIR} \ LIBDIR=${DATADIR} \ LOGDIR=${LOGDIR} \ + MANDIR=${PREFIX}/share/man \ SBINDIR=${PREFIX}/sbin \ STATEDIR=${STATEDIR} \ SPOOLDIR=${SPOOLDIR} diff --git a/sysutils/munin-common/pkg-plist b/sysutils/munin-common/pkg-plist index 861ac6cb36dd..097091fd157e 100644 --- a/sysutils/munin-common/pkg-plist +++ b/sysutils/munin-common/pkg-plist @@ -7,13 +7,13 @@ %%SITE_PERL%%/Munin/Common/TLSClient.pm %%SITE_PERL%%/Munin/Common/TLSServer.pm %%SITE_PERL%%/Munin/Common/Timeout.pm -man/man3/Munin::Common::Config.3.gz -man/man3/Munin::Common::Daemon.3.gz -man/man3/Munin::Common::Defaults.3.gz -man/man3/Munin::Common::TLS.3.gz -man/man3/Munin::Common::TLSClient.3.gz -man/man3/Munin::Common::TLSServer.3.gz -man/man3/Munin::Common::Timeout.3.gz +share/man/man3/Munin::Common::Config.3.gz +share/man/man3/Munin::Common::Daemon.3.gz +share/man/man3/Munin::Common::Defaults.3.gz +share/man/man3/Munin::Common::TLS.3.gz +share/man/man3/Munin::Common::TLSClient.3.gz +share/man/man3/Munin::Common::TLSServer.3.gz +share/man/man3/Munin::Common::Timeout.3.gz @dir(%%USER%%,%%GROUP%%,) %%LOGDIR%% @dir(%%USER%%,%%GROUP%%,) %%STATEDIR%% @dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%% diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile index 692493f96b9b..899288a390aa 100644 --- a/sysutils/munin-master/Makefile +++ b/sysutils/munin-master/Makefile @@ -1,5 +1,6 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils perl5 PKGNAMESUFFIX= -master @@ -52,8 +53,8 @@ PLIST_SUB+= WWWGRP=${WWWGRP} \ post-install: (cd ${WRKSRC}/build/doc; \ - ${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${PREFIX}/man/man5; \ - ${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 ${STAGEDIR}${PREFIX}/man/man8; \ + ${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5; \ + ${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 ${STAGEDIR}${PREFIX}/share/man/man8; \ ) (cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do ${MV} $$i $$i.sample; done) ${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist index 15880da62343..886024bdf143 100644 --- a/sysutils/munin-master/pkg-plist +++ b/sysutils/munin-master/pkg-plist @@ -55,25 +55,25 @@ bin/munin-cron %%SITE_PERL%%/Munin/Master/UpdateWorker.pm %%SITE_PERL%%/Munin/Master/Utils.pm %%SITE_PERL%%/Munin/Master/Worker.pm -man/man3/Munin::Master::Config.3.gz -man/man3/Munin::Master::Group.3.gz -man/man3/Munin::Master::GroupRepository.3.gz -man/man3/Munin::Master::HTMLOld.3.gz -man/man3/Munin::Master::Host.3.gz -man/man3/Munin::Master::LimitsOld.3.gz -man/man3/Munin::Master::Logger.3.gz -man/man3/Munin::Master::Node.3.gz -man/man3/Munin::Master::ProcessManager.3.gz -man/man3/Munin::Master::Update.3.gz -man/man3/Munin::Master::UpdateWorker.3.gz -man/man3/Munin::Master::Utils.3.gz -man/man3/Munin::Master::Worker.3.gz -man/man5/munin.conf.5.gz -man/man8/munin-cron.8.gz -man/man8/munin-graph.8.gz -man/man8/munin-html.8.gz -man/man8/munin-limits.8.gz -man/man8/munin-update.8.gz +share/man/man3/Munin::Master::Config.3.gz +share/man/man3/Munin::Master::Group.3.gz +share/man/man3/Munin::Master::GroupRepository.3.gz +share/man/man3/Munin::Master::HTMLOld.3.gz +share/man/man3/Munin::Master::Host.3.gz +share/man/man3/Munin::Master::LimitsOld.3.gz +share/man/man3/Munin::Master::Logger.3.gz +share/man/man3/Munin::Master::Node.3.gz +share/man/man3/Munin::Master::ProcessManager.3.gz +share/man/man3/Munin::Master::Update.3.gz +share/man/man3/Munin::Master::UpdateWorker.3.gz +share/man/man3/Munin::Master::Utils.3.gz +share/man/man3/Munin::Master::Worker.3.gz +share/man/man5/munin.conf.5.gz +share/man/man8/munin-cron.8.gz +share/man/man8/munin-graph.8.gz +share/man/man8/munin-html.8.gz +share/man/man8/munin-limits.8.gz +share/man/man8/munin-update.8.gz %%DATADIR%%/DejaVuSans.ttf %%DATADIR%%/DejaVuSansMono.ttf %%DATADIR%%/munin-datafile2storable diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index ba5e0876bf41..bcb71ca023ff 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -1,6 +1,6 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils perl5 PKGNAMESUFFIX= -node @@ -36,7 +36,6 @@ SHEBANG_FILES= node/bin/munindoc node/sbin/munin-node \ .include "${.CURDIR}/../munin-common/munin.mk" -MAKE_ENV= MANDIR=${PREFIX}/share/man ALL_TARGET= build-node build-plugins build/node/_bin/munin-async \ build/node/_bin/munin-asyncd INSTALL_TARGET= install-node-prime install-async-prime install-plugins-prime