From nobody Wed Jan 10 17:06:29 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 4T9DjL31dZz55NmH; Wed, 10 Jan 2024 17:06:30 +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 4T9DjL05C3z41Nm; Wed, 10 Jan 2024 17:06:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704906390; 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=j5m7Jh+xGbOeCEmvWnEBrcG22bMBfbzlZ9sfLF9GVBA=; b=yQVgfIWDuVpYF5X0X8Gri8bH8G1MKkhPpMKYWUvDrqJgnopeL4dIn9Y+w+gbSayALN+rmL bPlxrEiQxxFmGxUFijjuLCOzSh4xa0FYx9wexI0hWUFPzQWGjgvuT7krgkaa5xERmyuGa/ nf59c5BTMGwYNnA7STQDLAQ7BbD/7/ROSVgXznaEhcWyOeCiB2DbJz6tU2zd6Zdm8cFbdk JS/3fZXuc3OoRSdKjsV0FX+hLRJLJjFV/OHKoN4BTttQwGEyFIZ2qVPQ56K5iHUZ7G3Qih nW4btuqOnkMD62lGC2IOQLCD2179xWMp/n2KbU7LNoiiFIUo8qFNrzg1AJteew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704906390; 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=j5m7Jh+xGbOeCEmvWnEBrcG22bMBfbzlZ9sfLF9GVBA=; b=SzC7UCGHJ815sbAPkC8R/NxlLUYYxlZDUvm916S8p7AQi9BRvKvtStRMD+i1P+ff0E53Gd xC/HoYtf2Kccx3+dRb3i6xj8F80HCUtOaAijoDT2S3KisL0wounyWeIXlZfisqZEVYcUKo gI0rG+Ghx8OSJLtFhK0uoMzQ9gkZkFkGx69jhJaMZYxlriLXg7MZTb9Jrn9QmlaBX+9ZLT 6bHqBcznwTrYgu68fSH2EZryyUhQroC9bk7rZeP5sprOn6Voqz1Me8c2RoR4qX9WvyH5h4 seHlRHK9Gjb/WOARFOFfPhlTmr4Qc/jeA0luxf3R8cCabBg2kxGNiPfnpAhcaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704906390; a=rsa-sha256; cv=none; b=tsIKXtcLJ0uj/Ae/o/rFgXWEHtz8j1+OMMg5kr5ckzQwDg/CR6V/zGepUoh3BpIqH9Uc8r 9y8JJL/VhluIh4JmG4aI02k5nokziDSj0YyaZdLRW9YEd2cyJ2nbXEcnCeNRjXaPtmIU8q nnciPVQYIz+axJ/tsA+O6SjlZuxvsWSWF4xE1086+NvF1YmYJpj4EFh4XUBjcUgikv3fEx 2ng/Opm6+Ye3/O2JTpOx7UeF3hWx7AYn4apucgSH3VkpP+T+STYlEi5/1b3wuFOmUUJWnP P/qvi4rT9YJmakFvG6GpAsyNLQeDdVYjJBMGa7B2auCVBggiGqAcU8w7irBdkw== 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 4T9DjK6JzGzjyM; Wed, 10 Jan 2024 17:06:29 +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 40AH6TkY019776; Wed, 10 Jan 2024 17:06:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40AH6TWI019773; Wed, 10 Jan 2024 17:06:29 GMT (envelope-from git) Date: Wed, 10 Jan 2024 17:06:29 GMT Message-Id: <202401101706.40AH6TWI019773@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: d986942f8408 - main - sysutils/munin-node: eliminate the use of MAN?PREFIX and move man 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d986942f8408e2dc4095e28b8267f5df58722bd6 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=d986942f8408e2dc4095e28b8267f5df58722bd6 commit d986942f8408e2dc4095e28b8267f5df58722bd6 Author: Baptiste Daroussin AuthorDate: 2024-01-10 17:02:39 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-10 17:02:39 +0000 sysutils/munin-node: eliminate the use of MAN?PREFIX and move man to share/man --- sysutils/munin-node/Makefile | 8 ++++--- sysutils/munin-node/pkg-plist | 50 +++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index 1f85fc8fa442..ba5e0876bf41 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -1,5 +1,6 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils perl5 PKGNAMESUFFIX= -node @@ -35,6 +36,7 @@ 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 @@ -95,11 +97,11 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/plugins.conf \ ${STAGEDIR}${ETCDIR}/plugins.conf.sample (cd ${WRKSRC}/node/blib/bindoc; \ - ${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \ + ${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 ${STAGEDIR}${PREFIX}/share/man/man1; \ ) (cd ${WRKSRC}/build/doc; \ - ${INSTALL_MAN} munin-node.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \ - ${INSTALL_MAN} munin.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \ + ${INSTALL_MAN} munin-node.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5; \ + ${INSTALL_MAN} munin.8 ${STAGEDIR}${PREFIX}/share/man/man8; \ ) ${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-node.newsyslog diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist index 8e4a3fd7bc4f..5ad4b55d15e2 100644 --- a/sysutils/munin-node/pkg-plist +++ b/sysutils/munin-node/pkg-plist @@ -26,31 +26,31 @@ bin/munindoc %%SITE_PERL%%/Munin/Plugin.pm %%SITE_PERL%%/Munin/Plugin/Pgsql.pm %%SITE_PERL%%/Munin/Plugin/SNMP.pm -man/man1/munin-get.1.gz -man/man1/munin-node-configure.1.gz -man/man1/munin-node.1.gz -man/man1/munin-run.1.gz -man/man1/munindoc.1.gz -man/man3/Munin::Node::Config.3.gz -man/man3/Munin::Node::Configure::Debug.3.gz -man/man3/Munin::Node::Configure::History.3.gz -man/man3/Munin::Node::Configure::HostEnumeration.3.gz -man/man3/Munin::Node::Configure::Plugin.3.gz -man/man3/Munin::Node::Configure::PluginList.3.gz -man/man3/Munin::Node::Logger.3.gz -man/man3/Munin::Node::OS.3.gz -man/man3/Munin::Node::SNMPConfig.3.gz -man/man3/Munin::Node::Server.3.gz -man/man3/Munin::Node::Service.3.gz -man/man3/Munin::Node::Session.3.gz -man/man3/Munin::Node::SpoolReader.3.gz -man/man3/Munin::Node::SpoolWriter.3.gz -man/man3/Munin::Node::Utils.3.gz -man/man3/Munin::Plugin.3.gz -man/man3/Munin::Plugin::Pgsql.3.gz -man/man3/Munin::Plugin::SNMP.3.gz -man/man5/munin-node.conf.5.gz -man/man8/munin.8.gz +share/man/man1/munin-get.1.gz +share/man/man1/munin-node-configure.1.gz +share/man/man1/munin-node.1.gz +share/man/man1/munin-run.1.gz +share/man/man1/munindoc.1.gz +share/man/man3/Munin::Node::Config.3.gz +share/man/man3/Munin::Node::Configure::Debug.3.gz +share/man/man3/Munin::Node::Configure::History.3.gz +share/man/man3/Munin::Node::Configure::HostEnumeration.3.gz +share/man/man3/Munin::Node::Configure::Plugin.3.gz +share/man/man3/Munin::Node::Configure::PluginList.3.gz +share/man/man3/Munin::Node::Logger.3.gz +share/man/man3/Munin::Node::OS.3.gz +share/man/man3/Munin::Node::SNMPConfig.3.gz +share/man/man3/Munin::Node::Server.3.gz +share/man/man3/Munin::Node::Service.3.gz +share/man/man3/Munin::Node::Session.3.gz +share/man/man3/Munin::Node::SpoolReader.3.gz +share/man/man3/Munin::Node::SpoolWriter.3.gz +share/man/man3/Munin::Node::Utils.3.gz +share/man/man3/Munin::Plugin.3.gz +share/man/man3/Munin::Plugin::Pgsql.3.gz +share/man/man3/Munin::Plugin::SNMP.3.gz +share/man/man5/munin-node.conf.5.gz +share/man/man8/munin.8.gz sbin/munin-node sbin/munin-node-configure sbin/munin-run