--- munin-1.3.3.orig/Makefile	2006-11-10 04:39:14.000000000 -0800
+++ munin-1.3.3/Makefile	2007-02-25 02:24:52.000000000 -0800
@@ -28,72 +28,72 @@
 # This removes the installed config so that the next install-pass installs
 # a new config.  Target suitable for maintainers
 unconfig:
-	rm -f $(HTMLDIR)/.htaccess
-	rm -f $(CONFDIR)/munin.conf
+	rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
+	rm -f $(DESTDIR)$(CONFDIR)/munin.conf
 
 install-main: build
 	$(CHECKUSER)
-	mkdir -p $(CONFDIR)/templates
-	mkdir -p $(LIBDIR)
-	mkdir -p $(BINDIR)
-	mkdir -p $(PERLLIB)
-
-	mkdir -p $(LOGDIR)
-	mkdir -p $(STATEDIR)
-	mkdir -p $(HTMLDIR)
-	mkdir -p $(DBDIR)
-	mkdir -p $(CGIDIR)
+	mkdir -p $(DESTDIR)$(CONFDIR)/templates
+	mkdir -p $(DESTDIR)$(LIBDIR)
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(PERLLIB)
+
+	mkdir -p $(DESTDIR)$(LOGDIR)
+	mkdir -p $(DESTDIR)$(STATEDIR)
+	mkdir -p $(DESTDIR)$(HTMLDIR)
+	mkdir -p $(DESTDIR)$(DBDIR)
+	mkdir -p $(DESTDIR)$(CGIDIR)
 
-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
+	$(CHOWN) $(USER) $(DESTDIR)$(LOGDIR) $(DESTDIR)$(STATEDIR) $(DESTDIR)$(RUNDIR) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(DBDIR)
 
 	for p in build/server/*.tmpl; do    		         \
-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
+		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
 	done
-	$(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/
-	$(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
-	$(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
-	$(INSTALL) -m 0755 server/VeraMono.ttf $(LIBDIR)/
-	$(INSTALL) -m 0644 resources/favicon.ico $(HTMLDIR)/
-	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(HTMLDIR)/.htaccess
-	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
-	$(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
-	$(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/
-	$(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/
-	$(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/
-	$(INSTALL) -m 0755 build/server/munin-limits $(LIBDIR)/
-	$(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/
-	$(INSTALL) -m 0644 build/server/Munin.pm $(PERLLIB)/
+	$(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/
+	$(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/
+	$(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/
+	$(INSTALL) -m 0755 server/VeraMono.ttf $(DESTDIR)$(LIBDIR)/
+	$(INSTALL) -m 0644 resources/favicon.ico $(DESTDIR)$(HTMLDIR)/
+	test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
+	test -f "$(DESTDIR)$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/
+	$(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/
+	$(INSTALL) -m 0755 build/server/munin-update $(DESTDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/server/munin-graph $(DESTDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/server/munin-html $(DESTDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/server/munin-limits $(DESTDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/server/munin-cgi-graph $(DESTDIR)$(CGIDIR)/
+	$(INSTALL) -m 0644 build/server/Munin.pm $(DESTDIR)$(PERLLIB)/
 
 uninstall-main: build
 	for p in build/server/*.tmpl; do    	    \
-		rm -f $(CONFDIR)/templates/"$$p"  ; \
+		rm -f $(DESTDIR)$(CONFDIR)/templates/"$$p"  ; \
 	done
-	rm -f $(CONFDIR)/templates/logo.png
-	rm -f $(CONFDIR)/templates/style.css
-	rm -f $(CONFDIR)/templates/definitions.html
-	rm -f $(HTMLDIR)/.htaccess
-
-	rm -f $(CONFDIR)/munin.conf 
-
-	rm -f $(BINDIR)/munin-cron 
-
-	rm -f $(LIBDIR)/munin-update
-	rm -f $(LIBDIR)/munin-graph
-	rm -f $(LIBDIR)/munin-html
-	rm -f $(LIBDIR)/munin-limits
-	rm -f $(CGIDIR)/munin-cgi-graph
-
-	rm -f $(PERLLIB)/Munin.pm 
-	-rmdir $(CONFDIR)/templates
-	-rmdir $(CONFDIR)
-	-rmdir $(LIBDIR)
-	-rmdir $(BINDIR)
-
-	-rmdir $(LOGDIR)
-	-rmdir $(STATEDIR)
-	-rmdir $(HTMLDIR)
-	-rmdir $(DBDIR)
-	-rmdir $(CGIDIR)
+	rm -f $(DESTDIR)$(CONFDIR)/templates/logo.png
+	rm -f $(DESTDIR)$(CONFDIR)/templates/style.css
+	rm -f $(DESTDIR)$(CONFDIR)/templates/definitions.html
+	rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
+
+	rm -f $(DESTDIR)$(CONFDIR)/munin.conf 
+
+	rm -f $(DESTDIR)$(BINDIR)/munin-cron 
+
+	rm -f $(DESTDIR)$(LIBDIR)/munin-update
+	rm -f $(DESTDIR)$(LIBDIR)/munin-graph
+	rm -f $(DESTDIR)$(LIBDIR)/munin-html
+	rm -f $(DESTDIR)$(LIBDIR)/munin-limits
+	rm -f $(DESTDIR)$(CGIDIR)/munin-cgi-graph
+
+	rm -f $(DESTDIR)$(PERLLIB)/Munin.pm 
+	-rmdir $(DESTDIR)$(CONFDIR)/templates
+	-rmdir $(DESTDIR)$(CONFDIR)
+	-rmdir $(DESTDIR)$(LIBDIR)
+	-rmdir $(DESTDIR)$(BINDIR)
+
+	-rmdir $(DESTDIR)$(LOGDIR)
+	-rmdir $(DESTDIR)$(STATEDIR)
+	-rmdir $(DESTDIR)$(HTMLDIR)
+	-rmdir $(DESTDIR)$(DBDIR)
+	-rmdir $(DESTDIR)$(CGIDIR)
 
 install-node: build install-node-non-snmp install-node-snmp
 	echo Done.
@@ -102,41 +102,41 @@
 	echo Undone.
 
 install-node-snmp: build
-	$(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/
+	$(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/
 
 uninstall-node-snmp: build
-	rm -f $(SBINDIR)/munin-node-configure-snmp
-	-rmdir $(SBINDIR)
+	rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure-snmp
+	-rmdir $(DESTDIR)$(SBINDIR)
 
 install-node-non-snmp: build
 	$(CHECKGROUP)
-	mkdir -p $(CONFDIR)/plugins
-	mkdir -p $(CONFDIR)/plugin-conf.d
-	mkdir -p $(LIBDIR)/plugins
-	mkdir -p $(SBINDIR)
-	mkdir -p $(PERLLIB)/Munin/Plugin
-
-	mkdir -p $(LOGDIR)
-	mkdir -p $(STATEDIR)
-	mkdir -p $(PLUGSTATE)
-
-	$(CHGRP) $(GROUP) $(PLUGSTATE)
-	$(CHMOD) 775 $(PLUGSTATE)
-	$(CHMOD) 755 $(CONFDIR)/plugin-conf.d
-
-	$(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
-	$(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/
-	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
-	$(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/
+	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
+	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
+	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
+	mkdir -p $(DESTDIR)$(SBINDIR)
+	mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Plugin
+
+	mkdir -p $(DESTDIR)$(LOGDIR)
+	mkdir -p $(DESTDIR)$(STATEDIR)
+	mkdir -p $(DESTDIR)$(PLUGSTATE)
+
+	$(CHGRP) $(GROUP) $(DESTDIR)$(PLUGSTATE)
+	$(CHMOD) 775 $(DESTDIR)$(PLUGSTATE)
+	$(CHMOD) 755 $(DESTDIR)$(CONFDIR)/plugin-conf.d
+
+	$(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/
+	$(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/
+	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
+	$(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/
 
 uninstall-node-non-snmp: build
-	rm -f $(SBINDIR)/munin-node 
-	rm -f $(SBINDIR)/munin-node-configure
-	rm -f $(CONFDIR)/munin-node.conf 
-	rm -f $(SBINDIR)/munin-run
-	-rmdir $(CONFDIR)/plugin-conf.d
-	-rmdir $(CONFDIR)
-	-rmdir $(SBINDIR)
+	rm -f $(DESTDIR)$(SBINDIR)/munin-node 
+	rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure
+	rm -f $(DESTDIR)$(CONFDIR)/munin-node.conf 
+	rm -f $(DESTDIR)$(SBINDIR)/munin-run
+	-rmdir $(DESTDIR)$(CONFDIR)/plugin-conf.d
+	-rmdir $(DESTDIR)$(CONFDIR)
+	-rmdir $(DESTDIR)$(SBINDIR)
 
 # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
 # GENERIC ONES
@@ -148,64 +148,64 @@
 		if echo $(INSTALL_PLUGINS) |                           \
 		   grep $$family >/dev/null; then 	               \
 			echo Installing $$p;                           \
-			$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/;     \
+			$(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/;     \
 		fi;                                                    \
 	    fi                                                         \
 	done
-	-mkdir -p $(PLUGSTATE)
-	$(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
-	$(CHMOD) 0664 $(PLUGSTATE)
-	$(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/
-	$(INSTALL) -m 0644 build/node/plugin.sh $(LIBDIR)/plugins/
-	mkdir -p $(PERLLIB)/Munin
-	$(INSTALL) -m 0644 build/node/Plugin.pm $(PERLLIB)/Munin/
+	-mkdir -p $(DESTDIR)$(PLUGSTATE)
+	$(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE)
+	$(CHMOD) 0664 $(DESTDIR)$(PLUGSTATE)
+	$(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
+	$(INSTALL) -m 0644 build/node/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/
+	mkdir -p $(DESTDIR)$(PERLLIB)/Munin
+	$(INSTALL) -m 0644 build/node/Plugin.pm $(DESTDIR)$(PERLLIB)/Munin/
 
 uninstall-node-plugins: build $(PLUGINS)
 	for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \
-	    rm -f $(LIBDIR)/plugins/`basename $$p` \
+	    rm -f $(DESTDIR)$(LIBDIR)/plugins/`basename $$p` \
 	done
-	rm -f $(LIBDIR)/plugins/plugins.history
-	rm -f $(LIBDIR)/plugins/plugin.sh
+	rm -f $(DESTDIR)$(LIBDIR)/plugins/plugins.history
+	rm -f $(DESTDIR)$(LIBDIR)/plugins/plugin.sh
 
 #TODO:
 #configure plugins.
 
 install-man: build-man Makefile Makefile.config
-	mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8
-	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/
-	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/
-	$(INSTALL) -m 0644 build/doc/munin-node.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-run.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
+	mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/
+	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/
+	$(INSTALL) -m 0644 build/doc/munin-node.8 $(DESTDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(DESTDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(DESTDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-run.8 $(DESTDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/
 
 uninstall-man: build-man
-	rm -f $(MANDIR)/man5/munin-node.conf.5 
-	rm -f $(MANDIR)/man5/munin.conf.5 
-	rm -f $(MANDIR)/man8/munin-node.8
-	rm -f $(MANDIR)/man8/munin-node-configure.8 
-	rm -f $(MANDIR)/man8/munin-node-configure-snmp.8
-	rm -f $(MANDIR)/man8/munin-run.8
-	rm -f $(MANDIR)/man8/munin-graph.8 
-	rm -f $(MANDIR)/man8/munin-update.8 
-	rm -f $(MANDIR)/man8/munin-limits.8
-	rm -f $(MANDIR)/man8/munin-html.8
-	rm -f $(MANDIR)/man8/munin-cron.8 
-	-rmdir $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 $(MANDIR)
+	rm -f $(DESTDIR)$(MANDIR)/man5/munin-node.conf.5 
+	rm -f $(DESTDIR)$(MANDIR)/man5/munin.conf.5 
+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node.8
+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure.8 
+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure-snmp.8
+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-run.8
+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-graph.8 
+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-update.8 
+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-limits.8
+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-html.8
+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-cron.8 
+	-rmdir $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)
 
 install-doc: build-doc
-	mkdir -p $(DOCDIR)/resources
-	$(INSTALL) -m 0644 README $(DOCDIR)/
-	$(INSTALL) -m 0644 COPYING $(DOCDIR)/
-	$(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources
+	mkdir -p $(DESTDIR)$(DOCDIR)/resources
+	$(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/
+	$(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/
+	$(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources
 
 uninstall-doc: build-doc
-	rm -rf $(DOCDIR)
+	rm -rf $(DESTDIR)$(DOCDIR)
 
 build: build-stamp
 
@@ -349,11 +349,11 @@
 endif
 
 node-monkeywrench: install-node
-	rm -rf $(CONFDIR)/plugins
-	rm -rf $(LIBDIR)/plugins
-	mkdir -p $(LIBDIR)/plugins
-	mkdir -p $(CONFDIR)/plugins
-	cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
+	rm -rf $(DESTDIR)$(CONFDIR)/plugins
+	rm -rf $(DESTDIR)$(LIBDIR)/plugins
+	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
+	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
+	cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/
 	$(SBINDIR)/munin-node-configure --suggest
 	echo 'Done?'
 
--- munin-1.3.3.orig/Makefile.config	2006-11-10 04:39:31.000000000 -0800
+++ munin-1.3.3/Makefile.config	2007-02-25 02:08:46.000000000 -0800
@@ -9,10 +9,10 @@
 #
 # the base of the Munin installation.
 # 
-PREFIX     = $(DESTDIR)/opt/munin
+PREFIX     = /usr
 
 # Where Munin keeps its configurations (server.conf, client.conf, ++)
-CONFDIR    = $(DESTDIR)/etc/opt/munin
+CONFDIR    = /etc/munin
 
 # Server only - where to put munin-cron
 BINDIR     = $(PREFIX)/bin
@@ -21,31 +21,31 @@
 SBINDIR    = $(PREFIX)/sbin
 
 # Where to put text and html documentation
-DOCDIR     = $(PREFIX)/doc
+DOCDIR     = $(PREFIX)/share/doc/munin-$(VERSION)
 
 # Where to put man pages
-MANDIR     = $(PREFIX)/man
+MANDIR     = $(PREFIX)/share/man
 
 # Where to put internal binaries and plugin repository
-LIBDIR     = $(PREFIX)/lib
+LIBDIR     = $(PREFIX)/libexec/munin
 
 # Server only - Output directory
-HTMLDIR    = $(PREFIX)/var/www
-CGIDIR     = $(HTMLDIR)/cgi
+HTMLDIR    = /var/www/localhost/htdocs/munin
+CGIDIR     = /var/www/localhost/cgi-bin
 
 # Client only - Where to put RRD files and other intenal data
-DBDIR      = $(DESTDIR)/var/opt/munin
+DBDIR      = /var/lib/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     = $(DESTDIR)/var/log/munin
+LOGDIR     = /var/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   = /var/run/munin
 
 # The perl interpreter to use
 PERL       = $(shell which perl)
@@ -67,10 +67,11 @@
 BASH       = /bin/bash
 
 # Server only - Where to install the perl libraries
-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+PERLLIB    = $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
 
 # Client only - Install plugins for this architecture
-OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
+# LANG=C is because some locales are a bit different in their alphabet (eg ee_EE).
+OSTYPE     = $(shell uname | LANG=C tr '[A-Z]' '[a-z]')
 
 # How to figure out the hostname. (Only used in default configuration
 # files)