diff options
Diffstat (limited to 'sysutils/munin-master/files')
| -rw-r--r-- | sysutils/munin-master/files/patch-Makefile | 20 | ||||
| -rw-r--r-- | sysutils/munin-master/files/patch-Makefile.config | 53 | ||||
| -rw-r--r-- | sysutils/munin-master/files/pkg-message.in | 2 |
3 files changed, 40 insertions, 35 deletions
diff --git a/sysutils/munin-master/files/patch-Makefile b/sysutils/munin-master/files/patch-Makefile index e67b632a10e7..22cd60e4fefe 100644 --- a/sysutils/munin-master/files/patch-Makefile +++ b/sysutils/munin-master/files/patch-Makefile @@ -1,11 +1,11 @@ ---- Makefile.orig Tue May 11 22:23:06 2004 -+++ Makefile Fri Jun 4 00:25:54 2004 -@@ -26,7 +26,7 @@ - mkdir -p $(HTMLDIR) - mkdir -p $(DBDIR) +--- Makefile.orig 2010-01-30 10:49:44.000000000 -0700 ++++ Makefile 2010-01-30 10:49:53.000000000 -0700 +@@ -69,7 +69,7 @@ + mkdir -p $(LOGDIR) + mkdir -p $(STATEDIR) + mkdir -p $(CONFDIR) +- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) ++ $(CHOWN) $(USER) $(STATEDIR) -- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) -+ $(CHOWN) $(USER) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) - - for p in server/*.tmpl; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ + install-master-prime: $(INFILES_MASTER) install-pre install-master + mkdir -p $(CONFDIR)/templates diff --git a/sysutils/munin-master/files/patch-Makefile.config b/sysutils/munin-master/files/patch-Makefile.config index a231598e53d3..d26dd1be439c 100644 --- a/sysutils/munin-master/files/patch-Makefile.config +++ b/sysutils/munin-master/files/patch-Makefile.config @@ -1,6 +1,6 @@ ---- Makefile.config.orig 2008-01-20 20:32:46.000000000 +0100 -+++ Makefile.config 2008-08-09 15:44:18.000000000 +0200 -@@ -7,46 +7,50 @@ +--- Makefile.config.orig 2009-12-30 05:55:56.000000000 -0700 ++++ Makefile.config 2010-01-30 11:17:34.000000000 -0700 +@@ -17,29 +17,33 @@ # # the base of the Munin installation. # @@ -36,11 +36,16 @@ +LIBDIR = $(DATADIR) # Server only - Output directory --HTMLDIR = $(PREFIX)/var/www --CGIDIR = $(HTMLDIR)/cgi +-HTMLDIR = $(PREFIX)/www/docs +-CGIDIR = $(PREFIX)/www/cgi +HTMLDIR = $(WWWDIR) +CGIDIR = $(PREFIX)/www/cgi-bin + # Server only - spool directory for data gathered from nodes by + # munin-gather - experimental. Place on ramdisk to make munin +@@ -52,21 +56,20 @@ + # SSPOOLDIR := /tmp/muninspool + # Client only - Where to put RRD files and other intenal data -DBDIR = $(DESTDIR)/var/opt/munin +DBDIR = $(PREFIX)/var/munin @@ -50,8 +55,8 @@ PLUGSTATE = $(DBDIR)/plugin-state # Where Munin should place its logs. --LOGDIR = $(DESTDIR)/var/log/munin -+LOGDIR = /var/log/munin-main +-LOGDIR = $(PREFIX)/log/munin ++LOGDIR = /var/log/munin-master # Location of PID files and other statefiles. On the server, must be # writable by the user "munin". @@ -59,33 +64,33 @@ +STATEDIR = /var/run/munin # The perl interpreter to use --PERL = $(shell which perl) -+# Passed in from FreeBSD port Makefile. +-PERL := $(shell which perl) # The python interpreter to use (used by some plugins) - PYTHON = /usr/bin/env python -@@ -62,10 +66,10 @@ - GOODSH = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') + PYTHON := /usr/bin/env python +@@ -95,11 +98,11 @@ + GOODSH := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') # Path of bash for bash specific plugins --BASH = /bin/bash -+BASH = /usr/local/bin/bash +-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) + PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) +-PERLLIB = $(DESTDIR)$(PERLSITELIB) +PERLLIB = $(PREFIX)/$(SITE_PERL_REL) # Client only - Install plugins for this architecture - OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') -@@ -90,9 +94,8 @@ - PLUGINUSER = nobody - + OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]') +@@ -126,9 +129,8 @@ # 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")) + # These will work on most modern OSes: + # +-GETENT := $(shell which getent || which true 2>/dev/null) +-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) - # For OSX, comment out the previous two lines and comment in these - #CHECKUSER = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) + # For OSX, comment out the previous two lines and comment in these + # diff --git a/sysutils/munin-master/files/pkg-message.in b/sysutils/munin-master/files/pkg-message.in index df049437efa1..3a9a5ff0c819 100644 --- a/sysutils/munin-master/files/pkg-message.in +++ b/sysutils/munin-master/files/pkg-message.in @@ -1,6 +1,6 @@ ******************************************************************** Unless this file already existed, a sample configuration file -has been placed in %%PREFIX%%/etc/munin/munin.conf. +has been placed in %%ETCDIR%%/munin/munin.conf. Please edit it according to your needs. |