Index: head/sysutils/munin-common/distinfo =================================================================== --- head/sysutils/munin-common/distinfo (revision 524259) +++ head/sysutils/munin-common/distinfo (revision 524260) @@ -1,3 +1,3 @@ -TIMESTAMP = 1579522454 -SHA256 (munin-2.0.53.tar.gz) = 30579d1249b420d4d890aafac00ce0f52afba5e74104ced40f9821c49abcd493 -SIZE (munin-2.0.53.tar.gz) = 2263588 +TIMESTAMP = 1580129850 +SHA256 (munin-2.0.54.tar.gz) = 9930cebb0328a15b30edd7f4920ca89b61a24db5f55d0f70d76c00620daec3b3 +SIZE (munin-2.0.54.tar.gz) = 2264058 Index: head/sysutils/munin-common/files/patch-Makefile =================================================================== --- head/sysutils/munin-common/files/patch-Makefile (revision 524259) +++ head/sysutils/munin-common/files/patch-Makefile (revision 524260) @@ -1,173 +1,175 @@ +Install things at the correct places. + --- Makefile.orig 2019-11-20 19:39:52 UTC +++ Makefile @@ -95,96 +95,77 @@ install: install-master-prime install-common-prime ins install-pre: $(MAKEFILES) @$(CHECKUSER) - mkdir -p $(LOGDIR) - mkdir -p $(STATEDIR) - mkdir -p $(SPOOLDIR) - mkdir -p $(CONFDIR) - $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) + mkdir -p $(DESTDIR)$(CONFDIR) 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 $(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) + mkdir -p $(DESTDIR)$(CONFDIR)/templates + mkdir -p $(DESTDIR)$(CONFDIR)/static + mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial + mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d + mkdir -p $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(HTMLDIR) + mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp + mkdir -p $(DESTDIR)$(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" $(DESTDIR)$(CONFDIR)/templates/ ; \ done for p in master/static/* ; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \ + $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/static/ ; \ done for p in master/www/partial/*.tmpl; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \ + $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \ done - $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/ - $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/ + $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0644 master/DejaVuSans.ttf $(DESTDIR)$(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 $(DESTDIR)$(HTMLDIR)/.htaccess + $(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/munin-cgi-graph - $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(CGIDIR)/munin-cgi-html + $(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/munin-cgi-graph + $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(DESTDIR)$(CGIDIR)/munin-cgi-html 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) + mkdir -p $(DESTDIR)$(CONFDIR)/plugins + mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d + mkdir -p $(DESTDIR)$(LIBDIR)/plugins + mkdir -p $(DESTDIR)$(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 \ if test -f "$$p"; then \ echo Installing $$p; \ - $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ + $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ fi \ done - @# Some HP-UX plugins need *.adv support files in LIBDIR - if [ "$(OSTYPE)" = "hp-ux" ]; then mv $(LIBDIR)/plugins/*.adv $(LIBDIR); fi - $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ - $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ + $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ + $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ install-plugins-java: build-plugins-java - mkdir -p $(JAVALIBDIR) - $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/ - mkdir -p $(LIBDIR)/plugins + mkdir -p $(DESTDIR)$(JAVALIBDIR) + $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/ + mkdir -p $(DESTDIR)$(LIBDIR)/plugins for p in build/plugins/node.d.java/*; do \ if test -f "$$p"; then \ echo Installing $$p; \ - $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ + $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ fi \ done @@ -195,14 +176,14 @@ install-plugins-java: build-plugins-java install-async-prime: install-async install-async: - mkdir -p $(LIBDIR) - $(INSTALL) -m 0755 build/node/_bin/munin-async $(LIBDIR)/ - $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(LIBDIR)/ + mkdir -p $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 0755 build/node/_bin/munin-async $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(DESTDIR)$(LIBDIR)/ 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)/ + test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ install-common-prime: build-common install-common @@ -519,7 +500,7 @@ t/install: # This builds */Build from Build.PL %/Build: %/Build.PL - cd $* && $(PERL) -I. Build.PL + cd $* && $(PERL) -I. Build.PL --config perl=$(PERL) build-%: %/Build cd $* && $(PERL) Build @@ -535,6 +516,7 @@ install-%: %/Build --install_path script=$(BINDIR) \ --install_path sbin=$(SBINDIR) \ --install_path bindoc=$(MANDIR)/man1 \ + --destdir=$(DESTDIR) \ --install_path libdoc=$(MANDIR)/man3 test-%: %/Build Index: head/sysutils/munin-common/files/patch-Makefile.config =================================================================== --- head/sysutils/munin-common/files/patch-Makefile.config (revision 524259) +++ head/sysutils/munin-common/files/patch-Makefile.config (revision 524260) @@ -1,93 +1,95 @@ +Make locations overridables. (Passed as MAKE_ARGS.) + --- Makefile.config.orig 2018-07-24 11:34:38 UTC +++ Makefile.config @@ -17,62 +17,62 @@ # # the base of the Munin installation. # -PREFIX = $(DESTDIR)/opt/munin +PREFIX ?= $(DESTDIR)/opt/munin # Where Munin keeps its configurations (server.conf, client.conf, ++) -CONFDIR = $(DESTDIR)/etc/opt/munin +CONFDIR ?= $(DESTDIR)/etc/opt/munin # Server only - where to put munin-cron -BINDIR = $(PREFIX)/bin +BINDIR ?= $(PREFIX)/bin # Client only - where to put munin-node, munin-node-configure, and munin-run -SBINDIR = $(PREFIX)/sbin +SBINDIR ?= $(PREFIX)/sbin # Where to put text and html documentation -DOCDIR = $(PREFIX)/doc +DOCDIR ?= $(PREFIX)/doc # Where to put man pages -MANDIR = $(PREFIX)/man +MANDIR ?= $(PREFIX)/man # Where to put internal binaries and plugin repository -LIBDIR = $(PREFIX)/lib +LIBDIR ?= $(PREFIX)/lib # Server only - Output directory -HTMLDIR = $(PREFIX)/www/docs -CGIDIR = $(PREFIX)/www/cgi +HTMLDIR ?= $(PREFIX)/www/docs +CGIDIR ?= $(PREFIX)/www/cgi # Where to put internal data for master (RRD, internal files, ...) -DBDIR = $(DESTDIR)/var/opt/munin +DBDIR ?= $(DESTDIR)/var/opt/munin # Where to put internal data for node (plugin state, ...) -DBDIRNODE = $(DESTDIR)/var/opt/munin-node +DBDIRNODE ?= $(DESTDIR)/var/opt/munin-node # Client only - Where the spool files are written. Must be writable by # group "munin", and should be preserved between reboots -SPOOLDIR = $(DBDIR)/spool +SPOOLDIR ?= $(DBDIR)/spool # Client only - Where plugins should put their states. Must be writable by # group "munin", and should be preserved between reboots -PLUGSTATE = $(DBDIRNODE)/plugin-state +PLUGSTATE ?= $(DBDIRNODE)/plugin-state # Where Munin should place its logs. -LOGDIR = $(PREFIX)/log/munin +LOGDIR ?= $(PREFIX)/log/munin # Location of PID files and other statefiles. On the server, must be # writable by the user "munin". -STATEDIR = $(DESTDIR)/var/run/munin +STATEDIR ?= $(DESTDIR)/var/run/munin # The perl interpreter to use -PERL := $(shell which perl) +PERL := /usr/local/bin/perl # The python interpreter to use (used by some plugins) -PYTHON := /usr/bin/env python3 +PYTHON := /usr/local/bin/python # The ruby interpreter to use (used by some plugins) -RUBY := /usr/bin/env ruby +RUBY := /usr/local/bin/ruby # The java runtime to use (used by some plugins) -JAVARUN := /usr/bin/java +JAVARUN := /usr/local/bin/java # The java library dir to use (used by some plugins) # this is needed in order to be able to install @@ -92,7 +92,7 @@ JAVALIBDIR = $(LIBDIR) GOODSH := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` LANG=C sh -c 'type sh | sed "s/.* //"') # Path of bash for bash specific plugins -BASH := /bin/bash +BASH := /usr/local/bin/bash # Server only - Where to install the perl libraries PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2) Index: head/sysutils/munin-common/files/patch-node_munin-node.conf.in =================================================================== --- head/sysutils/munin-common/files/patch-node_munin-node.conf.in (revision 524259) +++ head/sysutils/munin-common/files/patch-node_munin-node.conf.in (revision 524260) @@ -1,19 +1,22 @@ +FreeBSD uses wheel as gid 0 +Ignore .sample files, they're sample from packages. + --- node/munin-node.conf.in.orig 2014-11-24 21:46:24 UTC +++ node/munin-node.conf.in @@ -10,7 +10,7 @@ background 1 setsid 1 user root -group root +group wheel # This is the timeout for the whole transaction. # Units are in sec. Default is 15 min @@ -30,6 +30,7 @@ ignore_file %$ ignore_file \.dpkg-(tmp|new|old|dist)$ ignore_file \.rpm(save|new)$ ignore_file \.pod$ +ignore_file \.sample$ # Set this if the client doesn't report the correct hostname when # telnetting to localhost, port 4949 Index: head/sysutils/munin-common/files/patch-node_sbin_munin-node =================================================================== --- head/sysutils/munin-common/files/patch-node_sbin_munin-node (revision 524259) +++ head/sysutils/munin-common/files/patch-node_sbin_munin-node (revision 524260) @@ -1,13 +1,16 @@ +plugins run in taint mode because the uid is changed, so the path must not +contain writable directories. + --- node/sbin/munin-node.orig 2014-11-24 21:46:24 UTC +++ node/sbin/munin-node @@ -54,6 +54,10 @@ sub main $ENV{$key} = $1; } + # plugins run in taint mode because the uid is changed, so the path + # must not contain writable directories. + $ENV{PATH}='/bin:/sbin:/usr/bin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin'; + parse_args(); my $config = Munin::Node::Config->instance(); Index: head/sysutils/munin-common/files/patch-node_sbin_munin-node-configure =================================================================== --- head/sysutils/munin-common/files/patch-node_sbin_munin-node-configure (revision 524259) +++ head/sysutils/munin-common/files/patch-node_sbin_munin-node-configure (revision 524260) @@ -1,13 +1,16 @@ +plugins run in taint mode because the uid is changed, so the path must not +contain writable directories. + --- node/sbin/munin-node-configure.orig 2014-11-24 21:46:24 UTC +++ node/sbin/munin-node-configure @@ -23,6 +23,10 @@ use warnings; use Getopt::Long; +# plugins run in taint mode because the uid is changed, so the path +# must not contain writable directories. +$ENV{PATH}='/bin:/sbin:/usr/bin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin'; + use Munin::Common::Defaults; use Munin::Node::Configure::PluginList; use Munin::Node::Configure::Debug; Index: head/sysutils/munin-common/files/patch-node_sbin_munin-run =================================================================== --- head/sysutils/munin-common/files/patch-node_sbin_munin-run (revision 524259) +++ head/sysutils/munin-common/files/patch-node_sbin_munin-run (revision 524260) @@ -1,12 +1,15 @@ ---- node/sbin/munin-run.orig 2020-01-15 21:12:19 UTC +plugins run in taint mode because the uid is changed, so the path must not +contain writable directories. + +--- node/sbin/munin-run.orig 2020-01-20 19:32:33 UTC +++ node/sbin/munin-run -@@ -110,6 +110,9 @@ sub main +@@ -115,6 +115,9 @@ sub main $ENV{$key} =~ /^(.*)$/s; $ENV{$key} = $1; } + # plugins run in taint mode because the uid is changed, so the path + # must not contain writable directories. + $ENV{PATH}='/bin:/sbin:/usr/bin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin'; $0 =~ /^(.*)$/; $0 = $1; Index: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in (revision 524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in (revision 524260) @@ -1,11 +1,13 @@ +Ignore autofs too. + --- plugins/node.d.freebsd/df.in.orig 2018-06-29 00:50:01 UTC +++ plugins/node.d.freebsd/df.in @@ -24,7 +24,7 @@ if [ "$1" = "autoconf" ]; then exit 0 fi -EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,sysfs,nfs,nullfs,cd9660" +EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,sysfs,nfs,nullfs,cd9660,autofs" if [ $(uname -s) = "GNU/kFreeBSD" ]; then # Debian ships df from GNU coreutils Index: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in (revision 524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in (revision 524260) @@ -1,25 +1,28 @@ +- iostat returns kB, not MB. +- Remove silly limits on IO + --- plugins/node.d.freebsd/iostat.in.orig 2014-11-24 21:46:24 UTC +++ plugins/node.d.freebsd/iostat.in @@ -41,7 +41,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title IOstat by bytes' echo 'graph_args --base 1024 -l 0' - echo 'graph_vlabel MB per ${graph_period} read+written' + echo 'graph_vlabel kB per ${graph_period} read+written' echo 'graph_category disk' echo 'graph_info This graph shows the I/O to and from block devices' # We don't give a XXXX about device or extended @@ -56,13 +56,11 @@ if [ "$1" = "config" ]; then for d in $drives; do echo "${d}_read.label ${d}" echo "${d}_read.type DERIVE" - echo "${d}_read.max 2000" echo "${d}_read.min 0" echo "${d}_read.graph no" echo "${d}_write.label ${d}" echo "${d}_write.info I/O on device ${d}" echo "${d}_write.type DERIVE" - echo "${d}_write.max 2000" echo "${d}_write.min 0" echo "${d}_write.negative ${d}_read" done Index: head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in (revision 524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in (revision 524260) @@ -1,11 +1,13 @@ +awk works just fine here. + --- plugins/node.d/ipmi_.in.orig 2017-01-18 20:25:20 UTC +++ plugins/node.d/ipmi_.in @@ -73,7 +73,7 @@ export CONFIG MEASURE #### Work is done in this awk script -ipmitool sensor | gawk -F'|' ' +ipmitool sensor | awk -F'|' ' BEGIN { FANS = ""; TEMPS = ""; Index: head/sysutils/munin-common/files/patch-plugins_node.d_multiping.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_multiping.in (revision 524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d_multiping.in (revision 524260) @@ -1,10 +1,12 @@ +Initialize variable. + --- plugins/node.d/multiping.in.orig 2018-12-19 20:56:49 UTC +++ plugins/node.d/multiping.in @@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos host=${host:-www.google.com} +site=0 if [ "$1" = "config" ]; then echo graph_title Ping times echo 'graph_args --base 1000 -l 0' Index: head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in (revision 524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in (revision 524260) @@ -1,11 +1,13 @@ +awk works just fine here. + --- plugins/node.d/multips_memory.in.orig 2018-09-21 02:11:11 UTC +++ plugins/node.d/multips_memory.in @@ -137,7 +137,7 @@ fi for name in $names; do fieldname="$(clean_fieldname "$name")" - ps -eo "$monitor,comm" | gawk ' + ps -eo "$monitor,comm" | awk ' BEGIN { total = "U"; } # U = Unknown. /grep/ { next; } $2 ~ /^'"$name"'$/ { total = total + ($1*1024); } Index: head/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in (revision 524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in (revision 524260) @@ -1,31 +1,33 @@ +Allow overriding some variables. + --- plugins/node.d/nutups_.in.orig 2018-07-24 11:34:38 UTC +++ plugins/node.d/nutups_.in @@ -7,21 +7,25 @@ # # usage: nutups_upsid_function # +# env.upsc (default: "/bin/upsc") +# env.upsconf (default: "/etc/nut/ups.conf") +# #%# family=contrib #%# capabilities=autoconf suggest UPS=$(basename "$0" | cut -d_ -f2) FUNCTION=$(basename "$0" | cut -d_ -f3) UPSC=$(command -v upsc) +UPSCONF=${upsconf:-/etc/nut/ups.conf} if [ "$1" = "autoconf" ]; then - [ -x "$UPSC" ] && [ -r /etc/nut/ups.conf ] && echo yes && exit 0 - echo "no (upsc or /etc/nut/ups.conf not found)" + [ -x "$UPSC" ] && [ -r "$UPSCONF" ] && echo yes && exit 0 + echo "no ($UPSC or $UPSCONF not found)" exit 0 fi if [ "$1" = "suggest" ]; then - grep '^\[[^]]*\]$' /etc/nut/ups.conf \ + grep '^\[[^]]*\]$' "$UPSCONF" \ | tr -d '][' \ | while read -r ups; do for i in voltages freq charge current; do Index: head/sysutils/munin-common/munin.mk =================================================================== --- head/sysutils/munin-common/munin.mk (revision 524259) +++ head/sysutils/munin-common/munin.mk (revision 524260) @@ -1,38 +1,38 @@ LICENSE= GPLv2 -MUNIN_VERSION= 2.0.53 +MUNIN_VERSION= 2.0.54 MUNIN_SITES= http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/ DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files PORTSCOUT= limitw:1,even DBDIR?= /var/${PORTNAME} DBDIRNODE?= /var/${PORTNAME} LOGDIR?= /var/log/${PORTNAME} STATEDIR?= /var/run/${PORTNAME} SPOOLDIR?= /var/spool/${PORTNAME} MUNIN_DIRS= BINDIR=${PREFIX}/bin \ CGIDIR=${PREFIX}/www/cgi-bin \ CONFDIR=${ETCDIR} \ DBDIR=${DBDIR} \ DBDIRNODE=${DBDIRNODE} \ DOCDIR=${DOCSDIR} \ HTMLDIR=${WWWDIR} \ LIBDIR=${DATADIR} \ LOGDIR=${LOGDIR} \ MANDIR=${MANPREFIX}/man \ SBINDIR=${PREFIX}/sbin \ STATEDIR=${STATEDIR} \ SPOOLDIR=${SPOOLDIR} MAKE_ARGS= ${MUNIN_DIRS} \ BASH=${LOCALBASE}/bin/bash \ PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL} USERS= munin GROUPS= munin PLIST_SUB= ${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS} SUB_LIST= ${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS} CPE_VENDOR= munin-monitoring MAKE_JOBS_UNSAFE= Try to use things before making thems.