sysutils/munin-*: Move man pages to share/man

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