- Stage

- Move a few patches around to stay consistent
- add a JAVA option to munin-node.

Sponsored by:	Absolight

1 files changed, 130 insertions, 14 deletions

diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 962dd45ca0e5..4202408dcc37 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -1,27 +1,143 @@
---- Makefile.orig	2012-08-31 17:22:50.000000000 +0200
-+++ Makefile	2012-09-08 00:38:17.000000000 +0200
-@@ -68,11 +68,11 @@
+--- Makefile.orig	2013-07-19 16:30:03 UTC
++++ Makefile
+@@ -68,60 +68,48 @@
  
  install-pre: Makefile Makefile.config
  	@$(CHECKUSER)
 -	mkdir -p $(LOGDIR)
 -	mkdir -p $(STATEDIR)
 -	mkdir -p $(SPOOLDIR)
-+#	mkdir -p $(LOGDIR)
-+#	mkdir -p $(STATEDIR)
-+#	mkdir -p $(SPOOLDIR)
- 	mkdir -p $(CONFDIR)
+-	mkdir -p $(CONFDIR)
 -	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
-+#	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
++	mkdir -p $(DESTDIR)$(CONFDIR)
  
  install-master-prime: $(INFILES_MASTER) install-pre install-master
- 	mkdir -p $(CONFDIR)/templates
-@@ -144,7 +144,7 @@
- 	mkdir -p $(LIBDIR)/plugins
+-	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)
+-
+-	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
+-	$(CHMOD) 0755 $(DBDIR)
+-
+-	$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
+-	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
++	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)
++	mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp
++	mkdir -p $(DESTDIR)$(CGIDIR)
+ 
+ 	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
+ 
+ # Not ready to be installed yet
+ # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
+@@ -139,33 +127,29 @@
+ install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
+ 	@$(CHECKGROUP)
+ 
+-	mkdir -p $(CONFDIR)/plugins
+-	mkdir -p $(CONFDIR)/plugin-conf.d
+-	mkdir -p $(LIBDIR)/plugins
++	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
++	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
++	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
  	mkdir -p $(PLUGSTATE)
  
 -	$(CHOWN) root:root $(PLUGSTATE)
-+	$(CHOWN) root:wheel $(PLUGSTATE)
- 	$(CHMOD) 0755 $(PLUGSTATE)
- 	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
+-	$(CHMOD) 0755 $(PLUGSTATE)
+-	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
+-
+ 	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
+-	$(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
+-	$(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
+-	$(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
++	$(HPUXONLY) mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR)
++	$(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
++	$(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
+ 
+@@ -426,6 +410,7 @@
+             --install_path sbin=$(SBINDIR)		\
+             --install_path bindoc=$(MANDIR)/man1	\
+             --install_path libdoc=$(MANDIR)/man3	\
++	    --destdir=$(DESTDIR)
  
+ test-%: %/Build
+ 	cd $* && $(PERL) Build test --verbose=0 || true