head 1.5; access; symbols pkgsrc-2019Q2:1.4.0.68 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.66 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.64 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.62 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.60 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.58 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.56 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.54 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.50 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.48 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.46 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.44 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.42 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.40 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.38 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.36 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.34 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.32 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.30 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.28 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.26 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.24 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.22 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.20 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.18 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.16 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.14 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.12 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.10 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.8 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.6 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.4 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.3.0.6 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.4 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.2 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.2.0.36 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.34 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.32 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.30 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.28 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.26 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.24 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.22 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.20 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.18 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.16 pkgsrc-2008Q1:1.2.0.14 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.12 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.10 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.8 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.6 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.4 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.2 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.1.1.1.0.2 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2019.09.09.12.21.45; author tm; state dead; branches; next 1.4; commitid Bfv9lDrkveejLkCB; 1.4 date 2011.04.30.19.10.13; author abs; state Exp; branches; next 1.3; 1.3 date 2010.07.11.18.15.47; author joerg; state Exp; branches; next 1.2; 1.2 date 2006.07.21.23.28.37; author abs; state Exp; branches; next 1.1; 1.1 date 2006.06.04.20.53.57; author he; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2006.06.04.20.53.57; author he; state Exp; branches; next ; desc @@ 1.5 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: patch-aa,v 1.4 2011/04/30 19:10:13 abs Exp $ --- Makefile.config.orig 2005-04-15 20:29:18.000000000 +0000 +++ Makefile.config @@@@ -7,32 +7,32 @@@@ # # the base of the Munin installation. # -PREFIX = $(DESTDIR)/opt/munin +UPREFIX=${DESTDIR}$(PREFIX) # Where Munin keeps its configurations (server.conf, client.conf, ++) -CONFDIR = $(DESTDIR)/etc/opt/munin +CONFDIR ?= $(UPREFIX)/etc/munin # Server only - where to put munin-cron -BINDIR = $(PREFIX)/bin +BINDIR = $(UPREFIX)/bin # Client only - where to put munin-node, munin-node-configure, and munin-run -SBINDIR = $(PREFIX)/sbin +SBINDIR = $(UPREFIX)/sbin # Where to put text and html documentation -DOCDIR = $(PREFIX)/doc +DOCDIR = $(UPREFIX)/share/doc/munin # Where to put man pages -MANDIR = $(PREFIX)/man +MANDIR = $(UPREFIX)/${PKGMANDIR} # Where to put internal binaries and plugin repository -LIBDIR = $(PREFIX)/lib +LIBDIR = $(UPREFIX)/lib/munin # Server only - Output directory -HTMLDIR = $(PREFIX)/var/www +HTMLDIR = $(UPREFIX)/www/munin/data CGIDIR = $(HTMLDIR)/cgi # Client only - Where to put RRD files and other intenal data -DBDIR = $(DESTDIR)/var/opt/munin +DBDIR = $(DESTDIR)/var/munin # Client only - Where plugins should put their states. Must be writable by # group "munin", and should be preserved between reboots @@@@ -45,14 +45,14 @@@@ LOGDIR = $(DESTDIR)/var/log/munin # writable by the user "munin". STATEDIR = $(DESTDIR)/var/run/munin -# The perl interpreter to use -PERL = $(shell which perl) +# The perl interpreter to use (passed in by pkgsrc) +PERL = ${PERL5} # The python interpreter to use (used by some plugins) -PYTHON = /usr/bin/env python +PYTHON = ${PYTHONBIN} # Server only - Where to install the perl libraries -PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") +PERLLIB = ${PERL5_SITELIB} # Client only - Install plugins for this architecture OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') @@@@ -65,16 +65,15 @@@@ HOSTNAME = $(shell hostname) VERSION = $(shell cat RELEASE) # User to run munin as -USER = munin -GROUP = munin +USER = ${MUNIN_USER} +GROUP = ${MUNIN_GROUP} # Default user to run the plugins as PLUGINUSER = nobody # Which command to use to check if the USER and GROUP to run Munin as, exists. -GETENT = $(shell which getent || which true 2>/dev/null) -CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) -CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) +CHECKUSER = $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +CHECKGROUP = $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) CHOWN = chown CHMOD = chmod @ 1.4 log @Fix a "/usr/bin/env python" usage, bump pkgrevision @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2010/07/11 18:15:47 joerg Exp $ @ 1.3 log @DESTDIR support. Fix usage of PKG_USERS. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2006/07/21 23:28:37 abs Exp $ d3 1 a3 1 --- Makefile.config.orig 2005-01-10 10:38:22.000000000 +0000 d47 1 a47 1 @@@@ -45,14 +49,14 @@@@ LOGDIR = $(DESTDIR)/var/log/munin d57 2 a58 1 PYTHON = /usr/bin/env python d66 1 a66 1 @@@@ -65,16 +69,15 @@@@ HOSTNAME = $(shell hostname) @ 1.2 log @Use PKG_SYSCONFSUBDIR so PKG_SYSCONFBASE can be set Use REPLACE_PERL on all plugins Adjust sensors_ to work with NetBSD 3 Bump PKGREVISION @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2006/06/04 20:53:57 he Exp $ d5 1 a5 1 @@@@ -7,32 +7,36 @@@@ d10 1 a10 5 +ifdef $(PREFIX) +UPREFIX=$(PREFIX) +else +UPREFIX=/usr/pkg +endif d30 1 a30 1 +MANDIR = $(UPREFIX)/man @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.config.orig 2005-01-10 11:38:22.000000000 +0100 d18 1 a18 1 +CONFDIR = $(UPREFIX)/etc/munin @ 1.1.1.1 log @Import the client version of the Munin system monitoring/graphing tool -- project homepage is at http://munin.sourceforge.net/ This package has added support for NetBSD, via a number of new plugin scripts where specific steps needs to be taken to collect information. I also modified the ntp_ plugin script to make it possible to not plot the NTP poll delay, leaving just jitter and offset, which IMO produces a more telling graph. @ text @@