1 files changed, 96 insertions, 0 deletions
diff --git a/sysutils/munin-common/files/patch-Makefile.config b/sysutils/munin-common/files/patch-Makefile.config
new file mode 100644
index 000000000000..7b9627fb5304
--- /dev/null
+++ b/sysutils/munin-common/files/patch-Makefile.config
@@ -0,0 +1,96 @@
+--- 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.
+ # 
+-PREFIX     = $(DESTDIR)/opt/munin
++ifdef PREFIX
++UPREFIX=$(PREFIX)
++else
++UPREFIX=/usr
++endif
+ 
+ # Where Munin keeps its configurations (server.conf, client.conf, ++)
+-CONFDIR    = $(DESTDIR)/etc/opt/munin
++CONFDIR    = $(PREFIX)/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)/doc
+ 
+ # Where to put man pages
+-MANDIR     = $(PREFIX)/man
++MANDIR     = $(UPREFIX)/man
+ 
+ # Where to put internal binaries and plugin repository
+-LIBDIR     = $(PREFIX)/lib
++LIBDIR     = $(DATADIR)
+ 
+ # Server only - Output directory
+-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
+ 
+ # Client only - Where plugins should put their states. Must be writable by
+ # group "munin", and should be preserved between reboots
+ PLUGSTATE  = $(DBDIR)/plugin-state
+ 
+ # Where Munin should place its logs.
+-LOGDIR     = $(PREFIX)/log/munin
++LOGDIR     = /var/log/munin-main
+ 
+ # Location of PID files and other statefiles. On the server, must be
+ # writable by the user "munin".
+-STATEDIR   = $(DESTDIR)/var/run/munin
++STATEDIR   = /var/run/munin
+ 
+ # The perl interpreter to use
+-PERL       := $(shell which perl)
+ 
+ # The python interpreter to use (used by some plugins)
+ 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
+ 
+ # Server only - Where to install the perl libraries
+ 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]')
+@@ -126,9 +129,8 @@
+ # Which command to use to check if the USER and GROUP to run Munin as, exists.
+ # 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
+ #