Revision: 10497
http://gar.svn.sourceforge.net/gar/?rev=10497&view=rev
Author: j_arndt
Date: 2010-07-11 16:58:06 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
munin: update to version 1.4.5
Modified Paths:
--------------
csw/mgar/pkg/munin/trunk/Makefile
csw/mgar/pkg/munin/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/munin/trunk/files/Makefile.config.patch
csw/mgar/pkg/munin/trunk/files/Makefile.patch
csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch
csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch
csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch
csw/mgar/pkg/munin/trunk/files/perl.patch
csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch
Removed Paths:
-------------
csw/mgar/pkg/munin/trunk/files/makefile.config.diff
csw/mgar/pkg/munin/trunk/files/makefile.diff
csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff
csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff
csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff
csw/mgar/pkg/munin/trunk/files/perl.diff
csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff
Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile 2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/Makefile 2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,10 +1,10 @@
GARNAME = munin
-GARVERSION = 1.4.3
+GARVERSION = 1.4.5
CATEGORIES = apps
SPKG_DESC_CSWmuninmaster = master component of the graphical network and
system monitoring munin
SPKG_DESC_CSWmuninnode = node component of the graphical network and system
monitoring munin
-SPKG_DESC_CSWmunincommin = common files for munin node and master
+SPKG_DESC_CSWmunincommon = common files for munin node and master
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.
@@ -21,13 +21,13 @@
DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW
DISTFILES += README.CSW
-PATCHFILES += makefile.diff
-PATCHFILES += makefile.config.diff
-PATCHFILES += sunos_memory.in.diff
-PATCHFILES += munin-node.conf.in.diff
-PATCHFILES += munin.conf.in.diff
-PATCHFILES += munin-graph.in.diff # match some paths to
/{etc|var}/opt/csw/munin
-PATCHFILES += perl.diff # shebang correctly set
+PATCHFILES += Makefile.patch
+PATCHFILES += Makefile.config.patch
+PATCHFILES += sunos_memory.in.patch
+PATCHFILES += munin-node.conf.in.patch
+PATCHFILES += munin.conf.in.patch
+PATCHFILES += munin-graph.in.patch # match some paths to
/{etc|var}/opt/csw/munin
+PATCHFILES += perl.patch # shebang correctly set
# We define upstream file regex so we can be notifed of new upstream software
release
UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums 2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/checksums 2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,17 +1,17 @@
-58ab277c1a958459e5270da07f017fb3 download/CSWmunincommon.prototype
-390277cc59e2c37d5b0bd4f2c3441996 download/CSWmuninmaster.postinstall
-8bd7bf2d0356a424fe58c7b3058ee3b4 download/CSWmuninmaster.prototype
-c4064b92df7835bf37b18e799aa6177e download/CSWmuninnode.prototype
-e6bafa4aa3cba7fc16e444ad168b4cd1 download/README.CSW
-59409f4b412953283c3df4546fd4886c download/apache-munin-cgi.conf.CSW
-e701d132ba0b6f3dcc90190860f5aa6b download/apache-munin.conf.CSW
-31aec7f9a9a452cc6c75c1096c937fdd download/cswmuninnode
-50fa4a545f878d79e219891c6ac8d2d2 download/cswusergroup
-43264e38738fb609a453d22592f4b010 download/makefile.config.diff
-07148c7b093dea95f7fcda8bcac53059 download/makefile.diff
-229646facc4e2bca6511b20b3e5eb73f download/munin-1.4.3.tar.gz
-523afc4767b0548a93bc7b47fc5996ec download/munin-graph.in.diff
-0e7e3ae081db51996eb5c01a4f08139f download/munin-node.conf.in.diff
-fed7c87522fed3224eac8cb507ddf8d0 download/munin.conf.in.diff
-bdb45d45fdf901092e6a5c4711e8223c download/perl.diff
-3a39524074d4581373fa20cd5ff5e5b8 download/sunos_memory.in.diff
+58ab277c1a958459e5270da07f017fb3 CSWmunincommon.prototype
+390277cc59e2c37d5b0bd4f2c3441996 CSWmuninmaster.postinstall
+8bd7bf2d0356a424fe58c7b3058ee3b4 CSWmuninmaster.prototype
+c4064b92df7835bf37b18e799aa6177e CSWmuninnode.prototype
+e777f0ddea3e09d0faf72780ad782995 Makefile.config.patch
+1e3c461f2beafce43d6b94f3af478e5e Makefile.patch
+e6bafa4aa3cba7fc16e444ad168b4cd1 README.CSW
+59409f4b412953283c3df4546fd4886c apache-munin-cgi.conf.CSW
+e701d132ba0b6f3dcc90190860f5aa6b apache-munin.conf.CSW
+31aec7f9a9a452cc6c75c1096c937fdd cswmuninnode
+50fa4a545f878d79e219891c6ac8d2d2 cswusergroup
+4ae84b9a27b686c3819d8d7b51d8cb4c munin-1.4.5.tar.gz
+1a13b606a5c82958ed8e9bf139044988 munin-graph.in.patch
+803021ab0539f83936c9adec6bd9336c munin-node.conf.in.patch
+e9d94e230c8719c5d7d3fe624e87bea2 munin.conf.in.patch
+c0e9f043fe5ea79a1fc7dfc91f09a961 perl.patch
+5673776262a0d1b2c386f45f0fd6a783 sunos_memory.in.patch
Added: csw/mgar/pkg/munin/trunk/files/Makefile.config.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/Makefile.config.patch
(rev 0)
+++ csw/mgar/pkg/munin/trunk/files/Makefile.config.patch 2010-07-11
16:58:06 UTC (rev 10497)
@@ -0,0 +1,135 @@
+From 0298d86c798e9ad08f763a05932b3bdc1d5db118 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <j...@opencsw.org>
+Date: Sun, 11 Jul 2010 18:03:49 +0200
+Subject: [PATCH] set paths to match OpenCSW
+
+---
+ Makefile.config | 42 ++++++++++++++++++++++--------------------
+ 1 files changed, 22 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile.config b/Makefile.config
+index 84f155b..cacaf20 100644
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -14,13 +14,15 @@
+ # and LOGDIR as subdirectories. Today, DBDIR contains configured
+ # domains, as well as PLUGSTATE, and we risk collisions.
+
++DESTDIR=$(DESTDIR)
++
+ #
+ # 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,47 +31,47 @@ 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
+
+ # Server only - spool directory for data gathered from nodes by
+ # munin-gather - experimental. Place on ramdisk to make munin
+ # scale better. On many versions of Linux as well as on Solaris
+ # /tmp will be a ramdisk.
+
+-SSPOOLDIR = $(PREFIX)/spool
++SSPOOLDIR = /tmp/muninspool
+
+ # Suggested directory name for a pulic ramdisk based tmp directory.
+ # SSPOOLDIR := /tmp/muninspool
+
+ # Client only - Where to put RRD files and other intenal data
+-DBDIR = $(DESTDIR)/var/opt/munin
++DBDIR = /var/opt/csw/munin/db
+
+ # 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/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
+@@ -95,11 +97,11 @@ JAVALIBDIR:= $(LIBDIR)
+ GOODSH := $(shell PATH=`getconf 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
+ OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]')
+@@ -111,7 +113,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 +128,9 @@ PLUGINUSER := 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
+ #
+@@ -159,4 +161,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.1
+
Added: csw/mgar/pkg/munin/trunk/files/Makefile.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/Makefile.patch
(rev 0)
+++ csw/mgar/pkg/munin/trunk/files/Makefile.patch 2010-07-11 16:58:06 UTC
(rev 10497)
@@ -0,0 +1,287 @@
+From 7ce22ffb9ee515d86ca799df9d8cc20fe723ffd0 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <j...@opencsw.org>
+Date: Sun, 11 Jul 2010 13:55:58 +0200
+Subject: [PATCH] expanded pathes to $(DESTDIR)
+
+---
+ Makefile | 177 ++++++++++++++++++++++++++++++--------------------------------
+ 1 files changed, 86 insertions(+), 91 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 88f8952..6099fc1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -49,8 +49,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
+@@ -66,52 +66,51 @@ endif
+
+ install-pre: Makefile Makefile.config
+ @$(CHECKUSER)
+- mkdir -p $(LOGDIR)
+- mkdir -p $(STATEDIR)
+- mkdir -p $(CONFDIR)
+- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
++ mkdir -p $(DESTDIR)$(LOGDIR)
++ mkdir -p $(DESTDIR)$(STATEDIR)
++ mkdir -p $(DESTDIR)$(CONFDIR)
+
+ install-master-prime: $(INFILES_MASTER) install-pre install-master
+- mkdir -p $(CONFDIR)/templates
+- 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 $(CGIDIR)
+-
+- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
+- $(CHMOD) 0755 $(DBDIR)
++ mkdir -p $(DESTDIR)$(CONFDIR)/templates
++ 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)$(CGIDIR)
++
++ #$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
++ $(CHMOD) 0755 $(DESTDIR)$(DBDIR)
+
+ for p in master/www/*.tmpl master/www/*.png master/www/*.css
resources/favicon.ico; do \
+- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
+ 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/www/definitions.html $(CONFDIR)/templates/
+- $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/
+- $(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/
++ $(INSTALL) -m 0644 master/www/definitions.html
$(DESTDIR)$(CONFDIR)/templates/
++ $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 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-graph $(LIBDIR)/
+- $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
+- $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/
+- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/
+- $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(CGIDIR)/
++ $(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-graph $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph
$(DESTDIR)$(CGIDIR)/
++ $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph
$(DESTDIR)$(CGIDIR)/
+
+ # 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
+@@ -122,28 +121,24 @@ install-node-plugins: install-plugins-prime
+ 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)
+-
+- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
+- $(CHMOD) 0775 $(PLUGSTATE)
+- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins
++ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins
++ mkdir -p $(DESTDIR)$(PLUGSTATE)
+
+ 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
+- -mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
+- $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
+- $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
++ -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)/
+
+ #TODO:
+ # configure plugins. Or not. Better done under the direction of the installer
+@@ -152,30 +147,30 @@ install-plugins-java: build-plugins-java
+ 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-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/
+- $(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-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/
++ $(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
+
+ ######################################################################
+
+@@ -189,28 +184,28 @@ 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|@@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@@|$(MANDIR)|g' \
+- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \
+- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \
+- -e 's|@@DBDIR@@|$(DBDIR)|g' \
+- -e 's|@@STATEDIR@@|$(STATEDIR)|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|@@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' \
+@@ -354,20 +349,20 @@ 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;\
++ PERL5LIB=$(DESTDIR)$(PERLLIB) $(PERL) $$test;\
+ done
+ 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:
+@@ -391,12 +386,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 || true
+--
+1.7.1
+
Deleted: csw/mgar/pkg/munin/trunk/files/makefile.config.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2010-07-11 14:03:10 UTC
(rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2010-07-11 16:58:06 UTC
(rev 10497)
@@ -1,116 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/Makefile.config
munin-1.4.3/Makefile.config
---- munin-1.4.3.orig/Makefile.config 2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/Makefile.config 2010-01-27 12:26:29.445565248 +0100
-@@ -14,13 +14,15 @@
- # and LOGDIR as subdirectories. Today, DBDIR contains configured
- # domains, as well as PLUGSTATE, and we risk collisions.
-
-+DESTDIR=$(DESTDIR)
-+
- #
- # 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,17 +31,17 @@
- 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
-
- # Server only - spool directory for data gathered from nodes by
- # munin-gather - experimental. Place on ramdisk to make munin
-@@ -52,24 +54,24 @@
- # SSPOOLDIR := /tmp/muninspool
-
- # Client only - Where to put RRD files and other intenal data
--DBDIR = $(DESTDIR)/var/opt/munin
-+DBDIR = /var/opt/csw/munin/db
-
- # 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/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
-@@ -95,11 +97,11 @@
- GOODSH := $(shell PATH=`getconf 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
- OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]')
-@@ -111,7 +113,7 @@
- # 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 +128,9 @@
- # 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
- #
-@@ -159,4 +161,4 @@
- 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;' )
Deleted: csw/mgar/pkg/munin/trunk/files/makefile.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/makefile.diff 2010-07-11 14:03:10 UTC
(rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/makefile.diff 2010-07-11 16:58:06 UTC
(rev 10497)
@@ -1,273 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/Makefile
munin-1.4.3/Makefile
---- munin-1.4.3.orig/Makefile 2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/Makefile 2010-01-27 22:01:51.419441374 +0100
-@@ -49,8 +49,8 @@
- # 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
-@@ -66,52 +66,51 @@
-
- install-pre: Makefile Makefile.config
- @$(CHECKUSER)
-- mkdir -p $(LOGDIR)
-- mkdir -p $(STATEDIR)
-- mkdir -p $(CONFDIR)
-- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
-+ mkdir -p $(DESTDIR)$(LOGDIR)
-+ mkdir -p $(DESTDIR)$(STATEDIR)
-+ mkdir -p $(DESTDIR)$(CONFDIR)
-
- install-master-prime: $(INFILES_MASTER) install-pre install-master
-- mkdir -p $(CONFDIR)/templates
-- 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 $(CGIDIR)
-+ mkdir -p $(DESTDIR)$(CONFDIR)/templates
-+ 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)$(CGIDIR)
-
-- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
-- $(CHMOD) 0755 $(DBDIR)
-+ #$(CHOWN) $(USER) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(DBDIR)
-+ $(CHMOD) 0755 $(DESTDIR)$(DBDIR)
-
- for p in master/www/*.tmpl master/www/*.png master/www/*.css
resources/favicon.ico; do \
-- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
-+ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
- 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/www/definitions.html $(CONFDIR)/templates/
-- $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/
-- $(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/
-+ $(INSTALL) -m 0644 master/www/definitions.html
$(DESTDIR)$(CONFDIR)/templates/
-+ $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/
-+ $(INSTALL) -m 0755 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-graph $(LIBDIR)/
-- $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
-- $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/
-- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/
-- $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(CGIDIR)/
-+ $(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-graph $(DESTDIR)$(LIBDIR)/
-+ $(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/
-+ $(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/
-+ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph
$(DESTDIR)$(CGIDIR)/
-+ $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph
$(DESTDIR)$(CGIDIR)/
-
- # 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
-@@ -122,28 +121,24 @@
- 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)
--
-- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
-- $(CHMOD) 0775 $(PLUGSTATE)
-- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
-+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins
-+ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
-+ mkdir -p $(DESTDIR)$(LIBDIR)/plugins
-+ mkdir -p $(DESTDIR)$(PLUGSTATE)
-
- 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
-- -mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
-- $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
-- $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
-+ -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 $(DESTDIR)$(JAVALIBDIR)
-+ $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar
$(DESTDIR)$(JAVALIBDIR)/
-
- #TODO:
- # configure plugins. Or not. Better done under the direction of the installer
-@@ -152,30 +147,30 @@
- 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-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/
-- $(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-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/
-+ $(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
-
- ######################################################################
-
-@@ -189,28 +184,28 @@
- @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|@@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@@|$(MANDIR)|g' \
-- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \
-- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \
-- -e 's|@@DBDIR@@|$(DBDIR)|g' \
-- -e 's|@@STATEDIR@@|$(STATEDIR)|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|@@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' \
-@@ -354,20 +349,20 @@
- $(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;\
-+ PERL5LIB=$(DESTDIR)$(PERLLIB) $(PERL) $$test;\
- done
- 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:
-@@ -391,12 +386,12 @@
- # 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 || true
Deleted: csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2010-07-11 14:03:10 UTC
(rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2010-07-11 16:58:06 UTC
(rev 10497)
@@ -1,18 +0,0 @@
-diff --speed-large-files --minimal -Nru
munin-1.4.3.orig/master/_bin/munin-graph.in
munin-1.4.3/master/_bin/munin-graph.in
---- munin-1.4.3.orig/master/_bin/munin-graph.in 2009-12-30
13:55:56.000000000 +0100
-+++ munin-1.4.3/master/_bin/munin-graph.in 2010-01-27 15:37:25.532990968
+0100
-@@ -135,10 +135,10 @@
-
- =head1 FILES
-
-- @@CONFDIR@@/munin.conf
-- @@DBDIR@@/*
-- @@LOGDIR@@/munin-graph
-- @@STATEDIR@@/*
-+ /etc/opt/csw/munin/munin.conf
-+ /var/opt/csw/munin/*
-+ /var/opt/csw/munin/munin-graph
-+ /var/opt/csw/munin/*
-
- =head1 AUTHORS
-
Added: csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch
(rev 0)
+++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch 2010-07-11 16:58:06 UTC
(rev 10497)
@@ -0,0 +1,31 @@
+From c7b05c6b5304a67c1b4226ba9473407a4953822d Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <j...@opencsw.org>
+Date: Sun, 11 Jul 2010 15:21:09 +0200
+Subject: [PATCH] set path names to /var/opt/csw/munin
+
+---
+ master/_bin/munin-graph.in | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/master/_bin/munin-graph.in b/master/_bin/munin-graph.in
+index 804d2bd..1ea9ddc 100755
+--- a/master/_bin/munin-graph.in
++++ b/master/_bin/munin-graph.in
+@@ -135,10 +135,10 @@ needed. To force redrawing of graphs (after
setup-changes et alia), use
+
+ =head1 FILES
+
+- @@CONFDIR@@/munin.conf
+- @@DBDIR@@/*
+- @@LOGDIR@@/munin-graph
+- @@STATEDIR@@/*
++ /etc/opt/csw/munin/munin.conf
++ /var/opt/csw/munin/*
++ /var/opt/csw/munin/munin-graph
++ /var/opt/csw/munin/*
+
+ =head1 AUTHORS
+
+--
+1.7.1
+
Deleted: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2010-07-11
14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2010-07-11
16:58:06 UTC (rev 10497)
@@ -1,23 +0,0 @@
-diff --speed-large-files --minimal -Nru
munin-1.4.3.orig/node/munin-node.conf.in munin-1.4.3/node/munin-node.conf.in
---- munin-1.4.3.orig/node/munin-node.conf.in 2009-12-30 13:55:56.000000000
+0100
-+++ munin-1.4.3/node/munin-node.conf.in 2010-01-27 22:15:03.160953219
+0100
-@@ -3,8 +3,8 @@
- #
-
- log_level 4
--log_file @@LOGDIR@@/munin-node.log
--pid_file @@STATEDIR@@/munin-node.pid
-+log_file /var/opt/csw/munin/munin-node.log
-+pid_file /var/opt/csw/munin/munin-node.pid
-
- background 1
- setsid 1
-@@ -26,7 +26,7 @@
- # Set this if the client doesn't report the correct hostname when
- # telnetting to localhost, port 4949
- #
--#host_name @@HOSTNAME@@
-+#host_name yourhostname
-
- # A list of addresses that are allowed to connect. This must be a
- # regular expression, since Net::Server does not understand CIDR-style
Added: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch
(rev 0)
+++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch 2010-07-11
16:58:06 UTC (rev 10497)
@@ -0,0 +1,36 @@
+From 272b43ac170c907476ad5698c960fd84b31996c3 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <j...@opencsw.org>
+Date: Sun, 11 Jul 2010 18:25:14 +0200
+Subject: [PATCH] munin-node.conf.in: set some paths for OpenCSW, change
hostname to "yourhostname"
+
+---
+ node/munin-node.conf.in | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/node/munin-node.conf.in b/node/munin-node.conf.in
+index 40793b2..67a92a5 100644
+--- a/node/munin-node.conf.in
++++ b/node/munin-node.conf.in
+@@ -3,8 +3,8 @@
+ #
+
+ log_level 4
+-log_file @@LOGDIR@@/munin-node.log
+-pid_file @@STATEDIR@@/munin-node.pid
++log_file /var/opt/csw/munin/munin-node.log
++pid_file /var/opt/csw/munin/run/munin-node.pid
+
+ background 1
+ setsid 1
+@@ -26,7 +26,7 @@ ignore_file \.pod$
+ # Set this if the client doesn't report the correct hostname when
+ # telnetting to localhost, port 4949
+ #
+-#host_name @@HOSTNAME@@
++#host_name yourhostname
+
+ # A list of addresses that are allowed to connect. This must be a
+ # regular expression, since Net::Server does not understand CIDR-style
+--
+1.7.1
+
Deleted: csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2010-07-11 14:03:10 UTC
(rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2010-07-11 16:58:06 UTC
(rev 10497)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/master/munin.conf.in
munin-1.4.3/master/munin.conf.in
---- munin-1.4.3.orig/master/munin.conf.in 2009-12-30 13:55:56.000000000
+0100
-+++ munin-1.4.3/master/munin.conf.in 2010-01-27 15:26:42.127815407 +0100
-@@ -57,7 +57,7 @@
- #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
-
- # a simple host tree
--[@@HOSTNAME@@]
-+[yourhostname]
- address 127.0.0.1
- use_node_name yes
-
Added: csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch
(rev 0)
+++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch 2010-07-11 16:58:06 UTC
(rev 10497)
@@ -0,0 +1,25 @@
+From f94f6692eeb6875abf5e52ecf8a192ac3430c6e3 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <j...@opencsw.org>
+Date: Sun, 11 Jul 2010 15:25:17 +0200
+Subject: [PATCH] changed default hostname to "yourhostname"
+
+---
+ master/munin.conf.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/master/munin.conf.in b/master/munin.conf.in
+index 3688d88..79d9729 100644
+--- a/master/munin.conf.in
++++ b/master/munin.conf.in
+@@ -57,7 +57,7 @@ includedir @@CONFDIR@@/munin-conf.d
+ #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
+
+ # a simple host tree
+-[@@HOSTNAME@@]
++[yourhostname]
+ address 127.0.0.1
+ use_node_name yes
+
+--
+1.7.1
+
Deleted: csw/mgar/pkg/munin/trunk/files/perl.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/perl.diff 2010-07-11 14:03:10 UTC (rev
10496)
+++ csw/mgar/pkg/munin/trunk/files/perl.diff 2010-07-11 16:58:06 UTC (rev
10497)
@@ -1,45 +0,0 @@
-diff --speed-large-files --minimal -Nru
munin-1.4.3.orig/master/_bin/munin-update.in
munin-1.4.3/master/_bin/munin-update.in
---- munin-1.4.3.orig/master/_bin/munin-update.in 2009-12-30
13:55:56.000000000 +0100
-+++ munin-1.4.3/master/_bin/munin-update.in 2010-01-27 15:45:19.655925252
+0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl
-+#!/opt/csw/bin/perl
-
- use warnings;
- use strict;
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/bin/munindoc
munin-1.4.3/node/bin/munindoc
---- munin-1.4.3.orig/node/bin/munindoc 2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/node/bin/munindoc 2010-01-27 15:45:11.095300986 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#/opt/csw/bin/perl -w
- # -*- perl -*-
- #
- # This script provides the basis for a plugin documentation system for
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/sbin/munin-node
munin-1.4.3/node/sbin/munin-node
---- munin-1.4.3.orig/node/sbin/munin-node 2009-12-30 13:55:56.000000000
+0100
-+++ munin-1.4.3/node/sbin/munin-node 2010-01-27 15:45:47.944337631 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -wT
-+#!/opt/csw/bin/perl -wT
- # -*- cperl -*-
- #
- # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
-diff --speed-large-files --minimal -Nru
munin-1.4.3.orig/node/sbin/munin-node-configure
munin-1.4.3/node/sbin/munin-node-configure
---- munin-1.4.3.orig/node/sbin/munin-node-configure 2009-12-30
13:55:56.000000000 +0100
-+++ munin-1.4.3/node/sbin/munin-node-configure 2010-01-27 15:46:18.906920790
+0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
- # -*- cperl -*-
- #
- # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt.
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/sbin/munin-run
munin-1.4.3/node/sbin/munin-run
---- munin-1.4.3.orig/node/sbin/munin-run 2009-12-30 13:55:56.000000000
+0100
-+++ munin-1.4.3/node/sbin/munin-run 2010-01-27 15:46:36.558632214 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -wT
-+#!/opt/csw/bin/perl -wT
- # -*- perl -*-
-
- # Copyright (C) 2004-2009
Added: csw/mgar/pkg/munin/trunk/files/perl.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/perl.patch (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/perl.patch 2010-07-11 16:58:06 UTC (rev
10497)
@@ -0,0 +1,66 @@
+From 15dad8e4d26c0e482e0fbb44fb8190faad852f27 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <j...@opencsw.org>
+Date: Sun, 11 Jul 2010 15:31:43 +0200
+Subject: [PATCH] set shebang to /opt/csw/bin/perl
+
+---
+ master/_bin/munin-update.in | 2 +-
+ node/bin/munindoc | 2 +-
+ node/sbin/munin-node | 2 +-
+ node/sbin/munin-node-configure | 2 +-
+ node/sbin/munin-run | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/master/_bin/munin-update.in b/master/_bin/munin-update.in
+index 8ff7794..0d044ae 100755
+--- a/master/_bin/munin-update.in
++++ b/master/_bin/munin-update.in
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#! /opt/csw/bin/perl
+
+ use warnings;
+ use strict;
+diff --git a/node/bin/munindoc b/node/bin/munindoc
+index e36f87b..e2334a1 100755
+--- a/node/bin/munindoc
++++ b/node/bin/munindoc
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # -*- perl -*-
+ #
+ # This script provides the basis for a plugin documentation system for
+diff --git a/node/sbin/munin-node b/node/sbin/munin-node
+index 5980d5e..389e73e 100755
+--- a/node/sbin/munin-node
++++ b/node/sbin/munin-node
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -wT
++#!/opt/csw/bin/perl -wT
+ # -*- cperl -*-
+ #
+ # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
+diff --git a/node/sbin/munin-node-configure b/node/sbin/munin-node-configure
+index b262924..c8a8dea 100755
+--- a/node/sbin/munin-node-configure
++++ b/node/sbin/munin-node-configure
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # -*- cperl -*-
+ #
+ # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt.
+diff --git a/node/sbin/munin-run b/node/sbin/munin-run
+index 3d28b6a..09fc71d 100755
+--- a/node/sbin/munin-run
++++ b/node/sbin/munin-run
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -wT
++#!/opt/csw/bin/perl -wT
+ # -*- perl -*-
+
+ # Copyright (C) 2004-2009
+--
+1.7.1
+
Deleted: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2010-07-11 14:03:10 UTC
(rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2010-07-11 16:58:06 UTC
(rev 10497)
@@ -1,21 +0,0 @@
-diff --speed-large-files --minimal -Nru
munin-1.4.3.orig/plugins/node.d.sunos/memory.in
munin-1.4.3/plugins/node.d.sunos/memory.in
---- munin-1.4.3.orig/plugins/node.d.sunos/memory.in 2009-12-30
13:55:56.000000000 +0100
-+++ munin-1.4.3/plugins/node.d.sunos/memory.in 2010-01-27 15:08:58.425391715
+0100
-@@ -17,7 +17,7 @@
- The following shows the default settings for this plugin:
-
- [memory]
-- env.top /usr/local/bin/top
-+ env.top /opt/csw/bin/top
-
- You can also set warning and critical limits with these env settings:
-
-@@ -61,7 +61,7 @@
-
- . $MUNIN_LIBDIR/plugins/plugin.sh
-
--TOP=${top:-/usr/local/bin/top}
-+TOP=${top:-/opt/csw/bin/top}
-
- if [ "$1" = "autoconf" ]; then
- if [ -x $TOP ] ; then
Added: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch
(rev 0)
+++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch 2010-07-11
16:58:06 UTC (rev 10497)
@@ -0,0 +1,34 @@
+From fd284599a4d41b327f87750c92bbeb22935df8b6 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <j...@opencsw.org>
+Date: Sun, 11 Jul 2010 15:01:31 +0200
+Subject: [PATCH] use top from OpenCSW
+
+---
+ plugins/node.d.sunos/memory.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/node.d.sunos/memory.in b/plugins/node.d.sunos/memory.in
+index 7b9300e..eeabbcb 100755
+--- a/plugins/node.d.sunos/memory.in
++++ b/plugins/node.d.sunos/memory.in
+@@ -17,7 +17,7 @@ top installed.
+ The following shows the default settings for this plugin:
+
+ [memory]
+- env.top /usr/local/bin/top
++ env.top /opt/csw/bin/top
+
+ You can also set warning and critical limits with these env settings:
+
+@@ -61,7 +61,7 @@ Fixme: Using kstat would be much better
+
+ . $MUNIN_LIBDIR/plugins/plugin.sh
+
+-TOP=${top:-/usr/local/bin/top}
++TOP=${top:-/opt/csw/bin/top}
+
+ if [ "$1" = "autoconf" ]; then
+ if [ -x $TOP ] ; then
+--
+1.7.1
+
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
