Revision: 19134
http://gar.svn.sourceforge.net/gar/?rev=19134&view=rev
Author: j_arndt
Date: 2012-09-02 06:22:32 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
munin/trunk: update to 2.0.6
Modified Paths:
--------------
csw/mgar/pkg/munin/trunk/Makefile
csw/mgar/pkg/munin/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/munin/trunk/files/0007-Expand-paths-with-DESTDIR.patch
csw/mgar/pkg/munin/trunk/files/0008-paths-in-Makefile.config.patch
Removed Paths:
-------------
csw/mgar/pkg/munin/trunk/files/0005-Expand-paths-with-DESTDIR.patch
csw/mgar/pkg/munin/trunk/files/0006-paths-in-Makefile.config.patch
Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile 2012-09-02 02:13:58 UTC (rev 19133)
+++ csw/mgar/pkg/munin/trunk/Makefile 2012-09-02 06:22:32 UTC (rev 19134)
@@ -1,7 +1,7 @@
-NAME = munin
-VERSION = 2.0.4
-CATEGORIES = apps
-GARTYPE = v2
+NAME = munin
+VERSION = 2.0.6
+CATEGORIES = apps
+GARTYPE = v2
define BLURB
Munin the monitoring tool surveys all your computers and remembers what it
saw. It presents all the information in graphs through a web interface.
@@ -19,8 +19,8 @@
PATCHFILES += 0001-paths-and-hostname-in-munin-node.conf.in.patch
PATCHFILES += 0001-replace-yourhostname-with-hostname-in-postinstall.patch
-PATCHFILES += 0005-Expand-paths-with-DESTDIR.patch
-PATCHFILES += 0006-paths-in-Makefile.config.patch
+PATCHFILES += 0006-Expand-paths-with-DESTDIR.patch
+PATCHFILES += 0008-paths-in-Makefile.config.patch
#
# Reinplacements
Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums 2012-09-02 02:13:58 UTC (rev 19133)
+++ csw/mgar/pkg/munin/trunk/checksums 2012-09-02 06:22:32 UTC (rev 19134)
@@ -1 +1 @@
-5efd93a070159f4554242a0ba38eb0b1 munin-2.0.4.tar.gz
+a64e7d3d7a7736f3959092145886ce88 munin-2.0.6.tar.gz
Deleted: csw/mgar/pkg/munin/trunk/files/0005-Expand-paths-with-DESTDIR.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/0005-Expand-paths-with-DESTDIR.patch
2012-09-02 02:13:58 UTC (rev 19133)
+++ csw/mgar/pkg/munin/trunk/files/0005-Expand-paths-with-DESTDIR.patch
2012-09-02 06:22:32 UTC (rev 19134)
@@ -1,371 +0,0 @@
-From c4dbc877ec6bbc288bc584f8d0d13acd35a2e12b Mon Sep 17 00:00:00 2001
-From: Juergen Arndt <j...@opencsw.org>
-Date: Sat, 28 Jul 2012 08:19:03 +0200
-Subject: [PATCH 5/6] Expand paths with DESTDIR
-
----
- Makefile | 230 +++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 116 insertions(+), 114 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7ec659f..8388447 100644
---- a/Makefile
-+++ b/Makefile
-@@ -9,6 +9,8 @@
- DEFAULTS = Makefile.config
- CONFIG = Makefile.config
-
-+DESTDIR =
-+
- include $(DEFAULTS)
- include $(CONFIG)
-
-@@ -55,8 +57,8 @@ uninstall:
- # This removes the installed config so that the next install-pass installs
- # a new config. Target _only_ suitable for maintainers.
- unconfig:
-- rm -f $(HTMLDIR)/.htaccess
-- rm -f $(CONFDIR)/munin.conf
-+ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
-+ rm -f $(DESTDIR)$(CONFDIR)/munin.conf
-
- tags:
- -rm -f TAGS
-@@ -68,63 +70,63 @@ install: install-master-prime install-common-prime
install-node-prime install-pl
-
- install-pre: Makefile Makefile.config
- @$(CHECKUSER)
-- mkdir -p $(LOGDIR)
-- mkdir -p $(STATEDIR)
-- mkdir -p $(SPOOLDIR)
-- mkdir -p $(CONFDIR)
-- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
-+ mkdir -p $(DESTDIR)$(LOGDIR)
-+ mkdir -p $(DESTDIR)$(STATEDIR)
-+ mkdir -p $(DESTDIR)$(SPOOLDIR)
-+ mkdir -p $(DESTDIR)$(CONFDIR)
-+ #$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
-
- install-master-prime: $(INFILES_MASTER) install-pre install-master
-- 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)$(PERLLIB)
-+ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master
-+ mkdir -p $(DESTDIR)$(HTMLDIR)
-+ mkdir -p $(DESTDIR)$(DBDIR)
-+ mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp
-+ mkdir -p $(DESTDIR)$(CGIDIR)
-+
-+ #$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
-+ $(CHMOD) 0755 $(DESTDIR)$(DBDIR)
-+
-+ #$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
-+ $(CHMOD) 0755 $(DESTDIR)$(DBDIR)/cgi-tmp
-
- 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)/
-+ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644
build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
-+ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(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)/
-+# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(DESTDIR)$(LIBDIR)/
-
- # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
- # GENERIC ONES
-@@ -139,29 +141,29 @@ endif
- 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 $(PLUGSTATE)
-+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins
-+ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
-+ mkdir -p $(DESTDIR)$(LIBDIR)/plugins
-+ mkdir -p $(DESTDIR)$(PLUGSTATE)
-
-- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
-+ #$(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
- # using g+rwxs, so plugins can create and modify their state file
without help
-- $(CHMOD) 02775 $(PLUGSTATE)
-- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
-+ #$(CHMOD) 02775 $(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 $(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 $(DESTDIR)$(JAVALIBDIR)
-+ $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar
$(DESTDIR)$(JAVALIBDIR)/
- mkdir -p $(LIBDIR)/plugins
- for p in build/plugins/node.d.java/*; do \
- if test -f "$$p" ; then \
-@@ -175,37 +177,37 @@ install-plugins-java: build-plugins-java
- # or the packager.
-
- install-async-prime:
-- mkdir -p $(LIBDIR)
-- $(INSTALL) -m 0755 build/node/_bin/munin-async $(LIBDIR)/
-- $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(LIBDIR)/
-+ mkdir -p $(DESTDIR)$(LIBDIR)
-+ $(INSTALL) -m 0755 build/node/_bin/munin-async $(DESTDIR)$(LIBDIR)/
-+ $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(DESTDIR)$(LIBDIR)/
-
- install-node-prime: install-node-pre install-node
-
- install-node-pre: build/node/munin-node.conf install-pre
-- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644
build/node/munin-node.conf $(CONFDIR)/
-+ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644
build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
-
-
- install-common-prime: build-common install-common
-
-
- 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-update.8 $(MANDIR)/man8/
-- $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
-- $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
-- $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
-- $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
-- $(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/
-- $(INSTALL) -m 0644 build/doc/munin.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-update.8 $(DESTDIR)$(MANDIR)/man8/
-+ $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
-+ $(INSTALL) -m 0644 build/doc/munin-graph.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/
-+ $(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/
-+ $(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/
-
-
- 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
-+ $(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/
-+ $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/
-+ $(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources
-
- ######################################################################
-
-@@ -218,29 +220,29 @@ build/%: %.in
- @echo "$< -> $@"
- @mkdir -p build/`dirname $<`
- @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \
-- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \
-- -e 's|@@BINDIR@@|$(BINDIR)|g' \
-- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \
-- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \
-- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
-- -e 's|@@MANDIR@@|$(MANDIR)|g' \
-- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \
-- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \
-- -e 's|@@DBDIR@@|$(DBDIR)|g' \
-- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \
-- -e 's|@@SPOOLDIR@@|$(SPOOLDIR)|g' \
-+ -e 's|@@CONFDIR@@|$(DESTDIR)$(CONFDIR)|g' \
-+ -e 's|@@BINDIR@@|$(DESTDIR)$(BINDIR)|g' \
-+ -e 's|@@SBINDIR@@|$(DESTDIR)$(SBINDIR)|g' \
-+ -e 's|@@DOCDIR@@|$(DESTDIR)$(DOCDIR)|g' \
-+ -e 's|@@LIBDIR@@|$(DESTDIR)$(LIBDIR)|g' \
-+ -e 's|@@MANDIR@@|$(DESTDIR)$(MANDIR)|g' \
-+ -e 's|@@LOGDIR@@|$(DESTDIR)$(LOGDIR)|g' \
-+ -e 's|@@HTMLDIR@@|$(DESTDIR)$(HTMLDIR)|g' \
-+ -e 's|@@DBDIR@@|$(DESTDIR)$(DBDIR)|g' \
-+ -e 's|@@STATEDIR@@|$(DESTDIR)$(STATEDIR)|g' \
-+ -e 's|@@SPOOLDIR@@|$(DESTDIR)$(SPOOLDIR)|g' \
- -e 's|@@PERL@@|$(PERL)|g' \
-- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \
-+ -e 's|@@PERLLIB@@|$(DESTDIR)$(PERLLIB)|g' \
- -e 's|@@PYTHON@@|$(PYTHON)|g' \
- -e 's|@@RUBY@@|$(RUBY)|g' \
- -e 's|@@JAVARUN@@|$(JAVARUN)|g' \
-- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \
-+ -e 's|@@JAVALIBDIR@@|$(DESTDIR)$(JAVALIBDIR)|g' \
- -e 's|@@OSTYPE@@|$(OSTYPE)|g' \
- -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \
- -e 's|@@MKTEMP@@|$(MKTEMP)|g' \
- -e 's|@@VERSION@@|$(VERSION)|g' \
-- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \
-- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \
-+ -e 's|@@PLUGSTATE@@|$(DESTDIR)$(PLUGSTATE)|g' \
-+ -e 's|@@CGIDIR@@|$(DESTDIR)$(CGIDIR)|g' \
- -e 's|@@USER@@|$(USER)|g' \
- -e 's|@@GROUP@@|$(GROUP)|g' \
- -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \
-@@ -258,17 +260,17 @@ build-common-pre: common/Build
- common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm
build-common-pre
- rm -f common/blib/lib/Munin/Common/Defaults.pm
- $(PERL) -pe 's{(PREFIX \s+=\s).*}{\1q{$(PREFIX)};}x; \
-- s{(CONFDIR \s+=\s).*}{\1q{$(CONFDIR)};}x; \
-- s{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \
-- s{(SBINDIR \s+=\s).*}{\1q{$(SBINDIR)};}x; \
-- s{(DOCDIR \s+=\s).*}{\1q{$(DOCDIR)};}x; \
-- s{(LIBDIR \s+=\s).*}{\1q{$(LIBDIR)};}x; \
-- s{(MANDIR \s+=\s).*}{\1q{$(MANDIR)};}x; \
-- s{(LOGDIR \s+=\s).*}{\1q{$(LOGDIR)};}x; \
-- s{(HTMLDIR \s+=\s).*}{\1q{$(HTMLDIR)};}x; \
-- s{(DBDIR \s+=\s).*}{\1q{$(DBDIR)};}x; \
-- s{(STATEDIR \s+=\s).*}{\1q{$(STATEDIR)};}x; \
-- s{(SPOOLDIR \s+=\s).*}{\1q{$(SPOOLDIR)};}x; \
-+ s{(CONFDIR \s+=\s).*}{\1q{$(DESTDIR)$(CONFDIR)};}x; \
-+ s{(BINDIR \s+=\s).*}{\1q{$(DESTDIR)$(BINDIR)};}x; \
-+ s{(SBINDIR \s+=\s).*}{\1q{$(DESTDIR)$(SBINDIR)};}x; \
-+ s{(DOCDIR \s+=\s).*}{\1q{$(DESTDIR)$(DOCDIR)};}x; \
-+ s{(LIBDIR \s+=\s).*}{\1q{$(DESTDIR)$(LIBDIR)};}x; \
-+ s{(MANDIR \s+=\s).*}{\1q{$(DESTDIR)$(MANDIR)};}x; \
-+ s{(LOGDIR \s+=\s).*}{\1q{$(DESTDIR)$(LOGDIR)};}x; \
-+ s{(HTMLDIR \s+=\s).*}{\1q{$(DESTDIR)$(HTMLDIR)};}x; \
-+ s{(DBDIR \s+=\s).*}{\1q{$(DESTDIR)$(DBDIR)};}x; \
-+ s{(STATEDIR \s+=\s).*}{\1q{$(DESTDIR)$(STATEDIR)};}x; \
-+ s{(SPOOLDIR \s+=\s).*}{\1q{$(DESTDIR)$(SPOOLDIR)};}x; \
- s{(PERL \s+=\s).*}{\1q{$(PERL)};}x; \
- s{(PERLLIB \s+=\s).*}{\1q{$(PERLLIB)};}x; \
- s{(PYTHON \s+=\s).*}{\1q{$(PYTHON)};}x; \
-@@ -277,8 +279,8 @@ common/blib/lib/Munin/Common/Defaults.pm:
common/lib/Munin/Common/Defaults.pm bu
- s{(HOSTNAME \s+=\s).*}{\1q{$(HOSTNAME)};}x; \
- s{(MKTEMP \s+=\s).*}{\1q{$(MKTEMP)};}x; \
- s{(VERSION \s+=\s).*}{\1q{$(VERSION)};}x; \
-- s{(PLUGSTATE \s+=\s).*}{\1q{$(PLUGSTATE)};}x; \
-- s{(CGIDIR \s+=\s).*}{\1q{$(CGIDIR)};}x; \
-+ s{(PLUGSTATE
\s+=\s).*}{\1q{$(DESTDIR)$(PLUGSTATE)};}x; \
-+ s{(CGIDIR \s+=\s).*}{\1q{$(DESTDIR)$(CGIDIR)};}x; \
- s{(USER \s+=\s).*}{\1q{$(USER)};}x; \
- s{(GROUP \s+=\s).*}{\1q{$(GROUP)};}x; \
- s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
-@@ -384,7 +386,7 @@ old-test: t/*.t
- $(MAKE) $@ CONFIG=t/Makefile.config
- else
- test_plugins = id_default id_root env
--old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
-+old-test: t/*.t t/install $(addprefix
$(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins))
- @for test in t/*.t; do \
- echo -n "$$test: "; \
- PERL5LIB=$(PERLLIB) $(PERL) $$test;\
-@@ -392,12 +394,12 @@ old-test: t/*.t t/install $(addprefix
$(CONFDIR)/plugins/,$(test_plugins))
- 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/
-- $(SBINDIR)/munin-node-configure --suggest
-+ 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/
-+ $(DESTDIR)$(SBINDIR)/munin-node-configure --suggest
- echo 'Done?'
-
- t/install:
-@@ -419,12 +421,12 @@ build-common: common/Build
- # can't seem to find a way to persuade it to write otherwhere.
- install-%: %/Build
- cd $* && $(PERL) Build install \
-- --install_path lib=$(PERLLIB) \
-- --install_path bin=$(BINDIR) \
-- --install_path script=$(BINDIR) \
-- --install_path sbin=$(SBINDIR) \
-- --install_path bindoc=$(MANDIR)/man1 \
-- --install_path libdoc=$(MANDIR)/man3 \
-+ --install_path lib=$(DESTDIR)$(PERLLIB) \
-+ --install_path bin=$(DESTDIR)$(BINDIR) \
-+ --install_path script=$(DESTDIR)$(BINDIR) \
-+ --install_path sbin=$(DESTDIR)$(SBINDIR) \
-+ --install_path bindoc=$(DESTDIR)$(MANDIR)/man1 \
-+ --install_path libdoc=$(DESTDIR)$(MANDIR)/man3 \
-
- test-%: %/Build
- cd $* && $(PERL) Build test --verbose=0 || true
---
-1.7.10.3
-
Deleted: csw/mgar/pkg/munin/trunk/files/0006-paths-in-Makefile.config.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/0006-paths-in-Makefile.config.patch
2012-09-02 02:13:58 UTC (rev 19133)
+++ csw/mgar/pkg/munin/trunk/files/0006-paths-in-Makefile.config.patch
2012-09-02 06:22:32 UTC (rev 19134)
@@ -1,120 +0,0 @@
-From c8297f1d1b8d35e75932c9a43060b8dabb7afc54 Mon Sep 17 00:00:00 2001
-From: Juergen Arndt <j...@opencsw.org>
-Date: Sat, 28 Jul 2012 08:25:46 +0200
-Subject: [PATCH 6/6] paths in Makefile.config
-
----
- Makefile.config | 38 +++++++++++++++++++-------------------
- 1 file changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile.config b/Makefile.config
-index 5bb6d18..7abbec8 100644
---- a/Makefile.config
-+++ b/Makefile.config
-@@ -17,10 +17,10 @@
- #
- # the base of the Munin installation.
- #
--PREFIX = $(DESTDIR)/opt/munin
-+PREFIX = /opt/csw
-
- # Where Munin keeps its configurations (server.conf, client.conf, ++)
--CONFDIR = $(DESTDIR)/etc/opt/munin
-+CONFDIR = /etc/opt/csw/munin
-
- # Server only - where to put munin-cron
- BINDIR = $(PREFIX)/bin
-@@ -29,20 +29,20 @@ BINDIR = $(PREFIX)/bin
- SBINDIR = $(PREFIX)/sbin
-
- # Where to put text and html documentation
--DOCDIR = $(PREFIX)/doc
-+DOCDIR = $(PREFIX)/share/doc/munin
-
- # 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)/www/docs
--CGIDIR = $(PREFIX)/www/cgi
-+HTMLDIR = /var/opt/csw/munin/www
-+CGIDIR = /var/opt/csw/munin/www/cgi-bin
-
- # Where to put RRD files and other internal data, both master and node
--DBDIR = $(DESTDIR)/var/opt/munin
-+DBDIR = /var/opt/csw/munin/db
-
- # Client only - Where the spool files are written. Must be writable by
- # group "munin", and should be preserved between reboots
-@@ -53,17 +53,17 @@ SPOOLDIR = $(DBDIR)/spool
- PLUGSTATE = $(DBDIR)/plugin-state
-
- # Where Munin should place its logs.
--LOGDIR = $(PREFIX)/log/munin
-+LOGDIR = /var/opt/csw/munin/log
-
- # Location of PID files and other statefiles. On the server, must be
- # writable by the user "munin".
--STATEDIR = $(DESTDIR)/var/run/munin
-+STATEDIR = /var/opt/csw/munin/run
-
- # The perl interpreter to use
--PERL := $(shell which perl)
-+PERL := /opt/csw/bin/perl
-
- # The python interpreter to use (used by some plugins)
--PYTHON := /usr/bin/env python
-+PYTHON := /opt/csw/bin/python
-
- # The ruby interpreter to use (used by some plugins)
- RUBY := /usr/bin/env ruby
-@@ -89,11 +89,11 @@ JAVALIBDIR = $(LIBDIR)
- GOODSH := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` sh -c
'type sh | sed "s/.* //"')
-
- # Path of bash for bash specific plugins
--BASH := /bin/bash
-+BASH := /usr/bin/bash
-
- # Server only - Where to install the perl libraries
- PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
--PERLLIB = $(DESTDIR)$(PERLSITELIB)
-+PERLLIB = $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
-
- # Client only - Install plugins for this architecture
- # the LANG=C makes tr work as expected, not regarding any locale it
-@@ -108,7 +108,7 @@ HOSTNAME := $(shell hostname)
- # What is the safest way to create a tempfile.
- # Default is to figure it out by testing various methods.
- # Replace this with a known platform-specific method
--MKTEMP := $(shell ./test-mktemp)
-+MKTEMP := $(shell mktemp)
-
- # Munin version number.
- VERSION := $(shell ./getversion)
-@@ -126,9 +126,9 @@ CGIUSER := nobody
- # 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"))
-+#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"))
-
- # For OSX, comment out the previous two lines and comment in these
- #
-@@ -163,4 +163,4 @@ JAR := jar
- JCVALID = $(shell $(JC) -version >/dev/null 2>/dev/null && echo "yes")
-
- # Check whether setruid functionality can be used
--HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid",
"d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq
"define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' )
-+HASSETR := $(shell /opt/csw/bin/perl -e 'use Config; my
@vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if
($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' )
---
-1.7.10.3
-
Added: csw/mgar/pkg/munin/trunk/files/0007-Expand-paths-with-DESTDIR.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/0007-Expand-paths-with-DESTDIR.patch
(rev 0)
+++ csw/mgar/pkg/munin/trunk/files/0007-Expand-paths-with-DESTDIR.patch
2012-09-02 06:22:32 UTC (rev 19134)
@@ -0,0 +1,378 @@
+From f99d35160dbf93410d9d542d412be5a84f746d28 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <j...@opencsw.org>
+Date: Sat, 1 Sep 2012 14:11:45 +0200
+Subject: [PATCH 7/8] Expand-paths-with-DESTDIR
+
+---
+ Makefile | 236 ++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 119 insertions(+), 117 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6a90e53..6e8354d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,6 +9,8 @@
+ DEFAULTS = Makefile.config
+ CONFIG = Makefile.config
+
++DESTDIR =
++
+ include $(DEFAULTS)
+ include $(CONFIG)
+
+@@ -55,8 +57,8 @@ uninstall:
+ # This removes the installed config so that the next install-pass installs
+ # a new config. Target _only_ suitable for maintainers.
+ unconfig:
+- rm -f $(HTMLDIR)/.htaccess
+- rm -f $(CONFDIR)/munin.conf
++ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
++ rm -f $(DESTDIR)$(CONFDIR)/munin.conf
+
+ tags:
+ -rm -f TAGS
+@@ -68,63 +70,63 @@ install: install-master-prime install-common-prime
install-node-prime install-pl
+
+ install-pre: Makefile Makefile.config
+ @$(CHECKUSER)
+- mkdir -p $(LOGDIR)
+- mkdir -p $(STATEDIR)
+- mkdir -p $(SPOOLDIR)
+- mkdir -p $(CONFDIR)
+- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
++ mkdir -p $(DESTDIR)$(LOGDIR)
++ mkdir -p $(DESTDIR)$(STATEDIR)
++ mkdir -p $(DESTDIR)$(SPOOLDIR)
++ mkdir -p $(DESTDIR)$(CONFDIR)
++ #$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
+
+ install-master-prime: $(INFILES_MASTER) install-pre install-master
+- 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)$(PERLLIB)
++ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master
++ mkdir -p $(DESTDIR)$(HTMLDIR)
++ mkdir -p $(DESTDIR)$(DBDIR)
++ mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp
++ mkdir -p $(DESTDIR)$(CGIDIR)
++
++ #$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
++ $(CHMOD) 0755 $(DESTDIR)$(DBDIR)
++
++ #$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
++ $(CHMOD) 0755 $(DESTDIR)$(DBDIR)/cgi-tmp
+
+ 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)/
++ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644
build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
++ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(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)/
++# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(DESTDIR)$(LIBDIR)/
+
+ # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
+ # GENERIC ONES
+@@ -139,33 +141,33 @@ endif
+ 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 $(PLUGSTATE)
++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins
++ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins
++ mkdir -p $(DESTDIR)$(PLUGSTATE)
+
+- $(CHOWN) root:root $(PLUGSTATE)
+- $(CHMOD) 0755 $(PLUGSTATE)
+- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
++ #$(CHOWN) root:root $(PLUGSTATE)
++ #$(CHMOD) 0755 $(DESTDIR)$(PLUGSTATE)
++ #$(CHMOD) 0755 $(DESTDIR)$(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 $(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
++ mkdir -p $(DESTDIR)$(JAVALIBDIR)
++ $(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
+
+@@ -175,36 +177,36 @@ install-plugins-java: build-plugins-java
+
+ install-async-prime:
+ mkdir -p $(LIBDIR)
+- $(INSTALL) -m 0755 build/node/_bin/munin-async $(LIBDIR)/
+- $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(LIBDIR)/
++ $(INSTALL) -m 0755 build/node/_bin/munin-async $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(DESTDIR)$(LIBDIR)/
+
+ install-node-prime: install-node-pre install-node
+
+ install-node-pre: build/node/munin-node.conf install-pre
+- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644
build/node/munin-node.conf $(CONFDIR)/
++ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644
build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
+
+
+ install-common-prime: build-common install-common
+
+
+ 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-update.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin.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-update.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-graph.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/
++ $(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/
+
+
+ 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
+
+ ######################################################################
+
+@@ -217,29 +219,29 @@ build/%: %.in
+ @echo "$< -> $@"
+ @mkdir -p build/`dirname $<`
+ @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \
+- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \
+- -e 's|@@BINDIR@@|$(BINDIR)|g' \
+- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \
+- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \
+- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+- -e 's|@@MANDIR@@|$(MANDIR)|g' \
+- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \
+- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \
+- -e 's|@@DBDIR@@|$(DBDIR)|g' \
+- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \
+- -e 's|@@SPOOLDIR@@|$(SPOOLDIR)|g' \
++ -e 's|@@CONFDIR@@|$(DESTDIR)$(CONFDIR)|g' \
++ -e 's|@@BINDIR@@|$(DESTDIR)$(BINDIR)|g' \
++ -e 's|@@SBINDIR@@|$(DESTDIR)$(SBINDIR)|g' \
++ -e 's|@@DOCDIR@@|$(DESTDIR)$(DOCDIR)|g' \
++ -e 's|@@LIBDIR@@|$(DESTDIR)$(LIBDIR)|g' \
++ -e 's|@@MANDIR@@|$(DESTDIR)$(MANDIR)|g' \
++ -e 's|@@LOGDIR@@|$(DESTDIR)$(LOGDIR)|g' \
++ -e 's|@@HTMLDIR@@|$(DESTDIR)$(HTMLDIR)|g' \
++ -e 's|@@DBDIR@@|$(DESTDIR)$(DBDIR)|g' \
++ -e 's|@@STATEDIR@@|$(DESTDIR)$(STATEDIR)|g' \
++ -e 's|@@SPOOLDIR@@|$(DESTDIR)$(SPOOLDIR)|g' \
+ -e 's|@@PERL@@|$(PERL)|g' \
+- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \
++ -e 's|@@PERLLIB@@|$(DESTDIR)$(PERLLIB)|g' \
+ -e 's|@@PYTHON@@|$(PYTHON)|g' \
+ -e 's|@@RUBY@@|$(RUBY)|g' \
+ -e 's|@@JAVARUN@@|$(JAVARUN)|g' \
+- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \
++ -e 's|@@JAVALIBDIR@@|$(DESTDIR)$(JAVALIBDIR)|g' \
+ -e 's|@@OSTYPE@@|$(OSTYPE)|g' \
+ -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \
+ -e 's|@@MKTEMP@@|$(MKTEMP)|g' \
+ -e 's|@@VERSION@@|$(VERSION)|g' \
+- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \
+- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \
++ -e 's|@@PLUGSTATE@@|$(DESTDIR)$(PLUGSTATE)|g' \
++ -e 's|@@CGIDIR@@|$(DESTDIR)$(CGIDIR)|g' \
+ -e 's|@@USER@@|$(USER)|g' \
+ -e 's|@@GROUP@@|$(GROUP)|g' \
+ -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \
+@@ -257,27 +259,27 @@ build-common-pre: common/Build
+ common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm
build-common-pre
+ rm -f common/blib/lib/Munin/Common/Defaults.pm
+ $(PERL) -pe 's{(PREFIX \s+=\s).*}{\1q{$(PREFIX)};}x; \
+- s{(CONFDIR \s+=\s).*}{\1q{$(CONFDIR)};}x; \
+- s{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \
+- s{(SBINDIR \s+=\s).*}{\1q{$(SBINDIR)};}x; \
+- s{(DOCDIR \s+=\s).*}{\1q{$(DOCDIR)};}x; \
+- s{(LIBDIR \s+=\s).*}{\1q{$(LIBDIR)};}x; \
+- s{(MANDIR \s+=\s).*}{\1q{$(MANDIR)};}x; \
+- s{(LOGDIR \s+=\s).*}{\1q{$(LOGDIR)};}x; \
+- s{(HTMLDIR \s+=\s).*}{\1q{$(HTMLDIR)};}x; \
+- s{(DBDIR \s+=\s).*}{\1q{$(DBDIR)};}x; \
+- s{(STATEDIR \s+=\s).*}{\1q{$(STATEDIR)};}x; \
+- s{(SPOOLDIR \s+=\s).*}{\1q{$(SPOOLDIR)};}x; \
++ s{(CONFDIR \s+=\s).*}{\1q{$(DESTDIR)$(CONFDIR)};}x; \
++ s{(BINDIR \s+=\s).*}{\1q{$(DESTDIR)$(BINDIR)};}x; \
++ s{(SBINDIR \s+=\s).*}{\1q{$(DESTDIR)$(SBINDIR)};}x; \
++ s{(DOCDIR \s+=\s).*}{\1q{$(DESTDIR)$(DOCDIR)};}x; \
++ s{(LIBDIR \s+=\s).*}{\1q{$(DESTDIR)$(LIBDIR)};}x; \
++ s{(MANDIR \s+=\s).*}{\1q{$(DESTDIR)$(MANDIR)};}x; \
++ s{(LOGDIR \s+=\s).*}{\1q{$(DESTDIR)$(LOGDIR)};}x; \
++ s{(HTMLDIR \s+=\s).*}{\1q{$(DESTDIR)$(HTMLDIR)};}x; \
++ s{(DBDIR \s+=\s).*}{\1q{$(DESTDIR)$(DBDIR)};}x; \
++ s{(STATEDIR \s+=\s).*}{\1q{$(DESTDIR)$(STATEDIR)};}x; \
++ s{(SPOOLDIR \s+=\s).*}{\1q{$(DESTDIR)$(SPOOLDIR)};}x; \
+ s{(PERL \s+=\s).*}{\1q{$(PERL)};}x; \
+- s{(PERLLIB \s+=\s).*}{\1q{$(PERLLIB)};}x; \
++ s{(PERLLIB \s+=\s).*}{\1q{$(DESTDIR)$(PERLLIB)};}x; \
+ s{(PYTHON \s+=\s).*}{\1q{$(PYTHON)};}x; \
+ s{(RUBY \s+=\s).*}{\1q{$(RUBY)};}x; \
+ s{(OSTYPE \s+=\s).*}{\1q{$(OSTYPE)};}x; \
+ s{(HOSTNAME \s+=\s).*}{\1q{$(HOSTNAME)};}x; \
+ s{(MKTEMP \s+=\s).*}{\1q{$(MKTEMP)};}x; \
+ s{(VERSION \s+=\s).*}{\1q{$(VERSION)};}x; \
+- s{(PLUGSTATE \s+=\s).*}{\1q{$(PLUGSTATE)};}x; \
+- s{(CGIDIR \s+=\s).*}{\1q{$(CGIDIR)};}x; \
++ s{(PLUGSTATE
\s+=\s).*}{\1q{$(DESTDIR)$(PLUGSTATE)};}x; \
++ s{(CGIDIR \s+=\s).*}{\1q{$(DESTDIR)$(CGIDIR)};}x; \
+ s{(USER \s+=\s).*}{\1q{$(USER)};}x; \
+ s{(GROUP \s+=\s).*}{\1q{$(GROUP)};}x; \
+ s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
+@@ -383,7 +385,7 @@ old-test: t/*.t
+ $(MAKE) $@ CONFIG=t/Makefile.config
+ else
+ test_plugins = id_default id_root env
+-old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
++old-test: t/*.t t/install $(addprefix
$(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins))
+ @for test in t/*.t; do \
+ echo -n "$$test: "; \
+ PERL5LIB=$(PERLLIB) $(PERL) $$test;\
+@@ -391,12 +393,12 @@ old-test: t/*.t t/install $(addprefix
$(CONFDIR)/plugins/,$(test_plugins))
+ 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/
+- $(SBINDIR)/munin-node-configure --suggest
++ 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/
++ $(DESTDIR)$(SBINDIR)/munin-node-configure --suggest
+ echo 'Done?'
+
+ t/install:
+@@ -418,12 +420,12 @@ build-common: common/Build
+ # can't seem to find a way to persuade it to write otherwhere.
+ install-%: %/Build
+ cd $* && $(PERL) Build install \
+- --install_path lib=$(PERLLIB) \
+- --install_path bin=$(BINDIR) \
+- --install_path script=$(BINDIR) \
+- --install_path sbin=$(SBINDIR) \
+- --install_path bindoc=$(MANDIR)/man1 \
+- --install_path libdoc=$(MANDIR)/man3 \
++ --install_path lib=$(DESTDIR)$(PERLLIB) \
++ --install_path bin=$(DESTDIR)$(BINDIR) \
++ --install_path script=$(DESTDIR)$(BINDIR) \
++ --install_path sbin=$(DESTDIR)$(SBINDIR) \
++ --install_path bindoc=$(DESTDIR)$(MANDIR)/man1 \
++ --install_path libdoc=$(DESTDIR)$(MANDIR)/man3 \
+
+ test-%: %/Build
+ cd $* && $(PERL) Build test --verbose=0 || true
+--
+1.7.11.3
+
Added: csw/mgar/pkg/munin/trunk/files/0008-paths-in-Makefile.config.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/0008-paths-in-Makefile.config.patch
(rev 0)
+++ csw/mgar/pkg/munin/trunk/files/0008-paths-in-Makefile.config.patch
2012-09-02 06:22:32 UTC (rev 19134)
@@ -0,0 +1,124 @@
+From d9e20050b6a2536ca454bdfbe358651168bfb04f Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <j...@opencsw.org>
+Date: Sat, 1 Sep 2012 14:19:33 +0200
+Subject: [PATCH 8/8] paths in Makefile.config
+
+---
+ Makefile.config | 40 ++++++++++++++++++++--------------------
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile.config b/Makefile.config
+index 9a762fa..d36b37e 100644
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -17,10 +17,10 @@
+ #
+ # the base of the Munin installation.
+ #
+-PREFIX = $(DESTDIR)/opt/munin
++PREFIX = /opt/csw
+
+ # Where Munin keeps its configurations (server.conf, client.conf, ++)
+-CONFDIR = $(DESTDIR)/etc/opt/munin
++CONFDIR = /etc/opt/csw/munin
+
+ # Server only - where to put munin-cron
+ BINDIR = $(PREFIX)/bin
+@@ -29,23 +29,23 @@ BINDIR = $(PREFIX)/bin
+ SBINDIR = $(PREFIX)/sbin
+
+ # Where to put text and html documentation
+-DOCDIR = $(PREFIX)/doc
++DOCDIR = $(PREFIX)/share/doc/munin
+
+ # 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)/www/docs
+-CGIDIR = $(PREFIX)/www/cgi
++HTMLDIR = /var/opt/csw/munin/www
++CGIDIR = /var/opt/csw/munin/www/cgi-bin
+
+ # Where to put internal data for master (RRD, internal files, ...)
+-DBDIR = $(DESTDIR)/var/opt/munin
++DBDIR = /var/opt/csw/munin/db
+
+ # Where to put internal data for node (plugin state, ...)
+-DBDIRNODE = $(DESTDIR)/var/opt/munin-node
++DBDIRNODE = /var/opt/csw/db/munin-node
+
+ # Client only - Where the spool files are written. Must be writable by
+ # group "munin", and should be preserved between reboots
+@@ -56,17 +56,17 @@ SPOOLDIR = $(DBDIR)/spool
+ PLUGSTATE = $(DBDIRNODE)/plugin-state
+
+ # Where Munin should place its logs.
+-LOGDIR = $(PREFIX)/log/munin
++LOGDIR = /var/opt/csw/munin/log
+
+ # Location of PID files and other statefiles. On the server, must be
+ # writable by the user "munin".
+-STATEDIR = $(DESTDIR)/var/run/munin
++STATEDIR = /var/opt/csw/munin/run
+
+ # The perl interpreter to use
+-PERL := $(shell which perl)
++PERL := /opt/csw/bin/perl
+
+ # The python interpreter to use (used by some plugins)
+-PYTHON := /usr/bin/env python
++PYTHON := /opt/csw/bin/python
+
+ # The ruby interpreter to use (used by some plugins)
+ RUBY := /usr/bin/env ruby
+@@ -92,11 +92,11 @@ JAVALIBDIR = $(LIBDIR)
+ GOODSH := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` sh -c
'type sh | sed "s/.* //"')
+
+ # Path of bash for bash specific plugins
+-BASH := /bin/bash
++BASH := /usr/bin/bash
+
+ # Server only - Where to install the perl libraries
+ PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+-PERLLIB = $(DESTDIR)$(PERLSITELIB)
++PERLLIB = $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+
+ # Client only - Install plugins for this architecture
+ # the LANG=C makes tr work as expected, not regarding any locale it
+@@ -111,7 +111,7 @@ HOSTNAME := $(shell hostname)
+ # What is the safest way to create a tempfile.
+ # Default is to figure it out by testing various methods.
+ # Replace this with a known platform-specific method
+-MKTEMP := $(shell ./test-mktemp)
++MKTEMP := $(shell mktemp)
+
+ # Munin version number.
+ VERSION := $(shell ./getversion)
+@@ -129,9 +129,9 @@ CGIUSER := nobody
+ # 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"))
++#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"))
+
+ # For OSX, comment out the previous two lines and comment in these
+ #
+@@ -169,4 +169,4 @@ JAR := jar
+ JCVALID = $(shell $(JC) -version >/dev/null 2>/dev/null && echo "yes")
+
+ # Check whether setruid functionality can be used
+-HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid",
"d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq
"define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' )
++HASSETR := $(shell /opt/csw/bin/perl -e 'use Config; my
@vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if
($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' )
+--
+1.7.11.3
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
