--- Makefile.config.orig	2006-05-08 16:24:20.000000000 -0700
+++ Makefile.config	2006-05-08 16:30:53.000000000 -0700
@@ -7,10 +7,10 @@
 #
 # the base of the Munin installation.
 # 
-PREFIX     = $(DESTDIR)/opt/munin
+PREFIX     = $(DESTDIR)/usr
 
 # Where Munin keeps its configurations (server.conf, client.conf, ++)
-CONFDIR    = $(DESTDIR)/etc/opt/munin
+CONFDIR    = $(DESTDIR)/etc/munin
 
 # Server only - where to put munin-cron
 BINDIR     = $(PREFIX)/bin
@@ -19,20 +19,20 @@
 SBINDIR    = $(PREFIX)/sbin
 
 # Where to put text and html documentation
-DOCDIR     = $(PREFIX)/doc
+DOCDIR     = $(PREFIX)/share/doc
 
 # Where to put man pages
-MANDIR     = $(PREFIX)/man
+MANDIR     = $(PREFIX)/share/man
 
 # Where to put internal binaries and plugin repository
 LIBDIR     = $(PREFIX)/lib
 
 # Server only - Output directory
-HTMLDIR    = $(PREFIX)/var/www
+HTMLDIR    = $(PREFIX)/var/www/localhost/htdocs/munin
 CGIDIR     = $(HTMLDIR)/cgi
 
 # Client only - Where to put RRD files and other intenal data
-DBDIR      = $(DESTDIR)/var/opt/munin
+DBDIR      = $(DESTDIR)/var/lib/munin
 
 # Client only - Where plugins should put their states. Must be writable by
 # group "munin", and should be preserved between reboots
@@ -72,10 +72,10 @@
 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"))
-
-CHOWN      = chown
-CHMOD      = chmod
-CHGRP      = chgrp
+# Gentoo: Ignore, since user creating is taking place later
+CHECKUSER:= true
+CHECKGROUP:= true
+CHOWN   := echo Not done: chown
+CHMOD   := echo Not done: chmod
+CHGRP   := echo Not done: chgrp
+

--- dists/tarball/munin-node	2004-12-27 01:00:00.000000000 +0100
+++ dists/tarball/munin-node	2004-12-27 20:42:53.801638024 +0000
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Copyright 2004 Andrei Mikhailovsky @ Arhont Ltd - Information Security http://www.arhont.com
+
+depend() {
+        need net
+}
+
+start() {
+	ebegin "Starting munin-node"
+	start-stop-daemon --quiet --start --pidfile /var/run/munin/munin-node.pid --exec /usr/sbin/munin-node
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping munin-node"
+	start-stop-daemon --quiet --stop --pidfile /var/run/munin/munin-node.pid
+	eend $?
+}

--- dists/tarball/plugins.conf        2004-11-16 17:49:33.000000000 +0000
+++ dists/tarball/plugins.conf	2005-01-03 16:45:50.574950932 +0000
@@ -29,3 +29,12 @@
 
 [postfix*]
 user root
+
+[hddtemp*]
+user root
+
+[vlan*]
+user root
+
+[fw_*]
+user root