head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.54
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.52
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.50
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.48
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.46
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.44
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.42
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.40
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.38
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.36
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.34
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.32
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.30
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.28
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.26
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.24
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.22
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.20
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.18
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.16
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.14
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.12
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.10
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.8
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.4
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.6
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.2
	pkgsrc-2019Q3-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2019.09.09.12.21.44;	author tm;	state Exp;
branches;
next	;
commitid	Bfv9lDrkveejLkCB;


desc
@@


1.1
log
@munin: update to version 2.0.49

Version bump from outdated version 1.x to munin 2.0.49. Developed and imported
from WIP in cooperation with Sebastian Wiedenroth, Roland Illig, Filip Hajny and
Francois Tigeot.
@
text
@$NetBSD$

Installation fixed to use all essential files, populate
PKG_SYSCONFDIR as expected by the Munin scripts. Gets
configured man3ext from Perl instead of assuming 3pm suffix.

--- Makefile.orig	Thu May  9 03:45:43 2019
+++ Makefile	Wed Aug 14 12:38:00 2019
@@@@ -33,8 +33,9 @@@@
 PODMAN8          := build/master/doc/munin-cron master/doc/munin master/doc/munin-check
 PODMAN5          := build/master/doc/munin.conf node/doc/munin-node.conf
 PYTHON_LINT_CALL ?= python3 -m flake8
+MAN3EXT          := $(shell $(PERL) -e 'use Config; print $$Config{man3ext};')
 CONFVAR_SUBSTITUTION_FILES = \
-	master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.3pm \
+	master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.$(MAN3EXT) \
	master/blib/lib/Munin/Master/HTMLOld.pm \
	node/blib/sbin/munin-node-configure \
	node/blib/sbin/munin-node \
@@@@ -94,50 +95,37 @@@@
 install: install-master-prime install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-man install-async-prime

 install-pre: $(MAKEFILES)
-	@@$(CHECKUSER)
-	mkdir -p $(LOGDIR)
-	mkdir -p $(STATEDIR)
-	mkdir -p $(SPOOLDIR)
-	mkdir -p $(CONFDIR)
-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
+	mkdir -p $(EGDIR)

 install-master-prime: $(INFILES_MASTER) install-pre install-master
-	mkdir -p $(CONFDIR)/templates
-	mkdir -p $(CONFDIR)/static
-	mkdir -p $(CONFDIR)/templates/partial
-	mkdir -p $(CONFDIR)/munin-conf.d
+	mkdir -p $(EGDIR)/templates
+	mkdir -p $(EGDIR)/static
+	mkdir -p $(EGDIR)/templates/partial
+	mkdir -p $(EGDIR)/munin-conf.d
	mkdir -p $(LIBDIR)
	mkdir -p $(BINDIR)
	mkdir -p $(PERLLIB)
	mkdir -p $(PERLLIB)/Munin/Master
	mkdir -p $(HTMLDIR)
-	mkdir -p $(DBDIR)
-	mkdir -p $(DBDIR)/cgi-tmp
	mkdir -p $(CGIDIR)

-	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
-	$(CHMOD) 0755 $(DBDIR)
-
-	$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
-	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
-
	for p in master/www/*.tmpl ;  do \
-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
+		$(INSTALL) -m 0644 "$$p" $(EGDIR)/templates/ ; \
	done

	for p in master/static/* ; do \
-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \
+		$(INSTALL) -m 0644 "$$p" $(EGDIR)/static/ ; \
	done

	for p in master/www/partial/*.tmpl; do \
-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
+		$(INSTALL) -m 0644 "$$p" $(EGDIR)/templates/partial/ ; \
	done

	$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
	$(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/

-	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
-	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
+	$(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
+	$(INSTALL) -m 0644 build/master/munin.conf $(EGDIR)/

	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
	$(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
@@@@ -156,17 +144,8 @@@@
 install-node-plugins: install-plugins-prime

 install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
-	@@$(CHECKGROUP)
-
-	mkdir -p $(CONFDIR)/plugins
-	mkdir -p $(CONFDIR)/plugin-conf.d
	mkdir -p $(LIBDIR)/plugins
-	mkdir -p $(PLUGSTATE)

-	$(CHOWN) root:root $(PLUGSTATE)
-	$(CHMOD) 0755 $(PLUGSTATE)
-	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
-
	@@# Process the OS specific plugins at the end. Otherwise they would be overridden by the
	@@# generic ones.
	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
@@@@ -205,7 +184,7 @@@@
 install-node-prime: install-node-pre install-node

 install-node-pre: build/node/munin-node.conf install-pre
-	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
+	$(INSTALL) -m 0644 build/node/munin-node.conf $(EGDIR)/


 install-common-prime: build-common install-common
@