[csw-devel] SF.net SVN: gar:[7501] csw/mgar/pkg/munin/trunk
j_arndt at users.sourceforge.net
j_arndt at users.sourceforge.net
Sat Nov 28 21:17:10 CET 2009
Revision: 7501
http://gar.svn.sourceforge.net/gar/?rev=7501&view=rev
Author: j_arndt
Date: 2009-11-28 20:17:10 +0000 (Sat, 28 Nov 2009)
Log Message:
-----------
munin: update to new versiion 1.4, added package for common files
Modified Paths:
--------------
csw/mgar/pkg/munin/trunk/Makefile
csw/mgar/pkg/munin/trunk/checksums
csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall
csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype
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/sunos_memory.in.diff
Added Paths:
-----------
csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype
csw/mgar/pkg/munin/trunk/files/perl.diff
Removed Paths:
-------------
csw/mgar/pkg/munin/trunk/files/munin-update.in.diff
csw/mgar/pkg/munin/trunk/files/munindoc.in.diff
csw/mgar/pkg/munin/trunk/files/perlpath.diff
Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/Makefile 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,9 +1,10 @@
GARNAME = munin
-GARVERSION = 1.3.4
+GARVERSION = 1.4.0
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
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.
@@ -12,8 +13,10 @@
SF_PROJ = munin
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz
+DISTFILES += CSWmuninmaster.postinstall
DISTFILES += CSWmuninmaster.prototype CSWmuninmaster.postinstall
DISTFILES += CSWmuninnode.prototype cswmuninnode
+DISTFILES += CSWmunincommon.prototype
DISTFILES += cswusergroup
DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW
DISTFILES += README.CSW
@@ -23,10 +26,8 @@
PATCHFILES += sunos_memory.in.diff
PATCHFILES += munin-node.conf.in.diff
PATCHFILES += munin.conf.in.diff
-PATCHFILES += munin-graph.in.diff # use monospace instead of VeraMono.ttf
-PATCHFILES += munin-update.in.diff # http://munin.projects.linpro.no/ticket/699
-PATCHFILES += munindoc.in.diff # PATH to perl set to /opt/csw/bin/perl
-PATCHFILES += perlpath.diff # shebang changed to #!@@PERL@@ -w
+PATCHFILES += munin-graph.in.diff # match some paths to /{etc|var}/opt/csw/munin
+PATCHFILES += perl.diff # shebang correctly set
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
@@ -35,21 +36,27 @@
# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
# UPSTREAM_MASTER_SITES =
-PACKAGES = CSWmuninmaster CSWmuninnode
+PACKAGES = CSWmuninmaster CSWmuninnode CSWmunincommon
CATALOGNAME_CSWmuninmaster = munin_master
CATALOGNAME_CSWmuninnode = munin_node
+CATALOGNAME_CSWmunincommon = munin_common
ARCHALL_CSWmuninmaster = 1
ARCHALL_CSWmuninnode = 1
+ARCHALL_CSWmunincommon = 1
-REQUIRED_PKGS_CSWmuninmaster = CSWpmnetserver CSWperl CSWpython CSWpmparserecdescent
-REQUIRED_PKGS_CSWmuninmaster += CSWpmhtmltmpl CSWpmdatemanip CSWpmmd5 CSWrrd CSWapache2
+REQUIRED_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon
+REQUIRED_PKGS_CSWmuninmaster += CSWrrd CSWapache2
REQUIRED_PKGS_CSWmuninmaster += CSWcswclassutils
-REQUIRED_PKGS_CSWmuninnode = CSWpmdbi CSWpmnetsnmp CSWpmnetserver CSWperl CSWtop CSWcswclassutils
+REQUIRED_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon
+REQUIRED_PKGS_CSWmuninnode += CSWcswclassutils
+REQUIRED_PKGS_CSWmuninnode += CSWperl CSWpmnetssleay
+
SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswpreserveconf ugfiles
SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswpreserveconf cswinitsmf
+SPKG_CLASSES_CSWmunincommon = none
CONFIGURE_ARGS = $(DIRPATHS)
@@ -69,13 +76,13 @@
@$(MAKECOOKIE)
install-custom:
- cat $(WORKSRC)/Makefile.config | sed -e "s;$$(DESTDIR);$(DESTDIR);g" > $(WORKSRC)/Makefile.config.tmp
- mv $(WORKSRC)/Makefile.config.tmp $(WORKSRC)/Makefile.config
- ( cd $(WORKSRC); gmake -f Makefile install)
+ @cat $(WORKSRC)/Makefile.config | sed -e "s;$$(DESTDIR);$(DESTDIR);g" > $(WORKSRC)/Makefile.config.tmp
+ @mv $(WORKSRC)/Makefile.config.tmp $(WORKSRC)/Makefile.config
+ @( cd $(WORKSRC); gmake -f Makefile ; gmake -f Makefile install)
#mv $(DESTDIR)/opt/csw/lib/plugins $(DESTDIR)/opt/csw/lib/munin_plugins
- mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/etc/opt/csw/munin/munin-node.conf.CSW
- mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/etc/opt/csw/munin/munin.conf.CSW
- @ginstall -d $(DESTDIR)/opt/csw/munin
+ @mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/etc/opt/csw/munin/munin-node.conf.CSW
+ @mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/etc/opt/csw/munin/munin.conf.CSW
+ #@ginstall -d $(DESTDIR)/opt/csw/munin
@ginstall -d $(DESTDIR)/etc/opt/csw/munin/apache
@ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin.conf.CSW
@ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW
Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/checksums 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,18 +1,17 @@
-b494ca780b9becd6a8611e255e606dd4 download/CSWmuninmaster.postinstall
-29939c1794e6c602d54effac74e5c89d download/CSWmuninmaster.prototype
-6cb29ccba599b5ddcea7581197bf986d download/CSWmuninnode.prototype
+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
-4eb0923e09f12335da8249ab7923e250 download/makefile.config.diff
-3ea1ba00633ac52c3a25306c3c9c52e0 download/makefile.diff
-064e12aa12bc7d4cb312b576ae658d1e download/munin-graph.in.diff
-ce97aa8e741383039fb365d1a322f3e7 download/munin-node.conf.in.diff
-4688659429fbebf8cafcc8eb8a1ee870 download/munin-update.in.diff
-737e3e3d2f68015dfb4e857909cde7da download/munin.conf.in.diff
-e3a58e582407981d4f5c5aed59cbfc47 download/munin_1.3.4.tar.gz
-8e21ff70a126779e33dd6457839184de download/munindoc.in.diff
-d1623381c74f05a174aa4704896ef5b6 download/perlpath.diff
-43db53191eaae75be35b3548a993c31e download/sunos_memory.in.diff
+fd380babe0e8adeb2fdceb2ff38c8e14 download/makefile.config.diff
+81ce1cb57e8331fad745635ad9f2debb download/makefile.diff
+e5afa54ed754c43b0b53c57ebac31915 download/munin-graph.in.diff
+a0754324697266f8ae3530fcbdf885c0 download/munin-node.conf.in.diff
+fcecf75276f36a96027976fd7d0dfdf9 download/munin.conf.in.diff
+95be0e6eb98c4c7b2a4f2f922b358414 download/munin_1.4.0.tar.gz
+9dc05eea4250fc1bc61436493ab9de75 download/perl.diff
+7cb3378da78576a51cacd5b753134ccf download/sunos_memory.in.diff
Added: csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype 2009-11-28 20:17:10 UTC (rev 7501)
@@ -0,0 +1,14 @@
+d none /opt/csw/share/man/man3 0755 root bin
+f none /opt/csw/share/man/man3/Munin::Common::Config.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Common::Defaults.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Common::TLS.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Common::TLSClient.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Common::TLSServer.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Common::Timeout.3perl 0444 root bin
+d none /opt/csw/share/perl/site_perl/Munin/Common 0755 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Common/Config.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Common/Defaults.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Common/TLS.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Common/TLSClient.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Common/TLSServer.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Common/Timeout.pm 0444 root bin
Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2009-11-28 20:17:10 UTC (rev 7501)
@@ -3,10 +3,9 @@
passwd -N munin
cat << EOF
-#
-#
-#
+=======================================================================
+
To get Munin running, please follow these steps:
(1) Append the following line to the crontab of the user 'munin':
@@ -31,7 +30,6 @@
svcadm restart cswapache2
-#
-#
-#
+=======================================================================
+
EOF
Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,15 +1,14 @@
d none /etc/opt/csw/munin 0755 root bin
d none /etc/opt/csw/munin/apache 0755 root bin
+f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW 0644 root bin
+f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin.conf.CSW 0644 root bin
+d none /etc/opt/csw/munin/munin-conf.d 0755 root bin
f cswpreserveconf /etc/opt/csw/munin/munin.conf.CSW 0644 root bin
-f none /opt/csw/bin/munin-check 0755 root bin
-f none /opt/csw/bin/munin-cron 0755 root bin
-f none /opt/csw/share/munin/fonts/VeraMono.ttf 0644 root bin
-f none /opt/csw/libexec/munin/munin-graph 0755 root bin
-f none /opt/csw/libexec/munin/munin-html 0755 root bin
-f none /opt/csw/libexec/munin/munin-limits 0755 root bin
-f none /opt/csw/libexec/munin/munin-update 0755 root bin
+d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin
d ugfiles /etc/opt/csw/munin/templates 0755 munin munin
f none /etc/opt/csw/munin/templates/definitions.html 0644 root bin
+f none /etc/opt/csw/munin/templates/favicon.ico 0644 root bin
+f none /etc/opt/csw/munin/templates/logo-h.png 0644 root bin
f none /etc/opt/csw/munin/templates/logo.png 0644 root bin
f none /etc/opt/csw/munin/templates/munin-comparison-day.tmpl 0644 root bin
f none /etc/opt/csw/munin/templates/munin-comparison-month.tmpl 0644 root bin
@@ -19,38 +18,82 @@
f none /etc/opt/csw/munin/templates/munin-nodeview.tmpl 0644 root bin
f none /etc/opt/csw/munin/templates/munin-overview.tmpl 0644 root bin
f none /etc/opt/csw/munin/templates/munin-serviceview.tmpl 0644 root bin
+d none /etc/opt/csw/munin/templates/partial 0755 root bin
+f none /etc/opt/csw/munin/templates/partial/bottom_navigation.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/partial/generated_by.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/partial/head.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/partial/logo_navigation.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/partial/logo_navigation_comparison.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/partial/logo_path.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/partial/path.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/style-1.2.css 0644 root bin
f none /etc/opt/csw/munin/templates/style.css 0644 root bin
+f none /opt/csw/bin/munin-check 0755 root bin
+f none /opt/csw/bin/munin-cron 0755 root bin
+d none /opt/csw/etc/pkg 0755 root bin
+d none /opt/csw/etc/pkg/CSWmuninmaster 0755 root bin
+f cswusergroup /opt/csw/etc/pkg/CSWmuninmaster/cswusergroup 0644 root bin
+d none /opt/csw/libexec 0755 root bin
+d none /opt/csw/libexec/munin 0755 root bin
+f none /opt/csw/libexec/munin/munin-graph 0755 root bin
+f none /opt/csw/libexec/munin/munin-html 0755 root bin
+f none /opt/csw/libexec/munin/munin-limits 0755 root bin
+f none /opt/csw/libexec/munin/munin-update 0755 root bin
d none /opt/csw/share/doc/munin_master 0755 root bin
+f none /opt/csw/share/doc/munin_master/README.CSW 0644 root bin
f none /opt/csw/share/doc/munin_master/license 0644 root bin
-f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin.conf.CSW 0644 root bin
-f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW 0644 root bin
-f none /opt/csw/share/doc/munin_master/README.CSW 0644 root bin
d none /opt/csw/share/man/man1 0755 root bin
+d none /opt/csw/share/man/man3 0755 root bin
+f none /opt/csw/share/man/man3/Munin::Master::Config.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::Group.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::GroupRepository.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::HTMLOld.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::Host.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::Logger.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::Node.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::ProcessManager.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::Update.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::UpdateWorker.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::Utils.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Master::Worker.3perl 0444 root bin
d none /opt/csw/share/man/man5 0755 root bin
f none /opt/csw/share/man/man5/munin.conf.5 0644 root bin
d none /opt/csw/share/man/man8 0755 root bin
+f none /opt/csw/share/man/man8/munin-check.8 0644 root bin
f none /opt/csw/share/man/man8/munin-cron.8 0644 root bin
f none /opt/csw/share/man/man8/munin-graph.8 0644 root bin
f none /opt/csw/share/man/man8/munin-html.8 0644 root bin
f none /opt/csw/share/man/man8/munin-limits.8 0644 root bin
f none /opt/csw/share/man/man8/munin-update.8 0644 root bin
+f none /opt/csw/share/man/man8/munin.8 0644 root bin
+d none /opt/csw/share/munin 0755 root bin
+d none /opt/csw/share/munin/fonts 0755 root bin
+f none /opt/csw/share/munin/fonts/VeraMono.ttf 0644 root bin
d none /opt/csw/share/perl 0755 root bin
d none /opt/csw/share/perl/site_perl 0755 root bin
d none /opt/csw/share/perl/site_perl/Munin 0755 root bin
-f none /opt/csw/share/perl/site_perl/Munin.pm 0644 root bin
-d none /opt/csw/share/perl/site_perl/Munin/Plugin 0755 root bin
-d none /var/opt 0755 root sys
-d none /var/opt/csw 0755 root bin
-d none /var/opt/csw/munin 0755 root bin
+d none /opt/csw/share/perl/site_perl/Munin/Master 0755 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/Config.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/GraphOld.pm 0555 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/Group.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/GroupRepository.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/HTMLOld.pm 0555 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/Host.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/LimitsOld.pm 0555 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/Logger.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/Node.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/ProcessManager.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/Update.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/UpdateWorker.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/Utils.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Master/Worker.pm 0444 root bin
d ugfiles /var/opt/csw/munin/www 0755 munin munin
-f ugfiles /var/opt/csw/munin/www/.htaccess 0644 munin munin
d ugfiles /var/opt/csw/munin/www/cgi 0755 munin munin
f ugfiles /var/opt/csw/munin/www/cgi/munin-cgi-graph 0755 munin munin
-f ugfiles /var/opt/csw/munin/www/favicon.ico 0644 munin munin
+f ugfiles /var/opt/csw/munin/www/cgi/munin-fastcgi-graph 0755 munin munin
+d ugfiles /var/opt/csw/munin 0755 munin munin
d ugfiles /var/opt/csw/munin/db 0755 munin munin
-d ugfiles /var/opt/csw/munin/db/plugin-state 0755 munin munin
d ugfiles /var/opt/csw/munin/log 0755 munin munin
d ugfiles /var/opt/csw/munin/run 0755 munin munin
-d none /opt/csw/etc/pkg 0755 root bin
-d none /opt/csw/etc/pkg/CSWmuninmaster 0755 root bin
-f cswusergroup /opt/csw/etc/pkg/CSWmuninmaster/cswusergroup 0644 root bin
+d ugfiles /var/opt/csw/munin/www 0755 munin munin
+f ugfiles /var/opt/csw/munin/www/.htaccess 0644 munin munin
Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,3 +1,5 @@
+d none /etc/opt/csw/init.d 0755 root bin
+f cswinitsmf /etc/opt/csw/init.d/cswmuninnode 0755 root bin
d none /etc/opt/csw/munin 0755 root bin
f cswpreserveconf /etc/opt/csw/munin/munin-node.conf.CSW 0644 root bin
d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin
@@ -2,3 +4,8 @@
d none /etc/opt/csw/munin/plugins 0755 root bin
-f none /opt/csw/bin/munindoc 0755 root bin
+f none /opt/csw/bin/munindoc 0555 root bin
+d none /opt/csw/etc/pkg 0755 root bin
+d none /opt/csw/etc/pkg/CSWmuninnode 0755 root bin
+f cswusergroup /opt/csw/etc/pkg/CSWmuninnode/cswusergroup 0644 root bin
+d none /opt/csw/libexec 0755 root bin
+d none /opt/csw/libexec/munin 0755 root bin
d none /opt/csw/libexec/munin/plugins 0755 root bin
@@ -10,6 +17,14 @@
f none /opt/csw/libexec/munin/plugins/apache_volume 0755 root bin
f none /opt/csw/libexec/munin/plugins/apc_envunit_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/apc_nis 0755 root bin
+f none /opt/csw/libexec/munin/plugins/asterisk_channels 0755 root bin
+f none /opt/csw/libexec/munin/plugins/asterisk_channelstypes 0755 root bin
+f none /opt/csw/libexec/munin/plugins/asterisk_codecs 0755 root bin
+f none /opt/csw/libexec/munin/plugins/asterisk_meetme 0755 root bin
+f none /opt/csw/libexec/munin/plugins/asterisk_meetmeusers 0755 root bin
+f none /opt/csw/libexec/munin/plugins/asterisk_sipchannels 0755 root bin
+f none /opt/csw/libexec/munin/plugins/asterisk_sippeers 0755 root bin
+f none /opt/csw/libexec/munin/plugins/asterisk_voicemail 0755 root bin
f none /opt/csw/libexec/munin/plugins/bind9 0755 root bin
f none /opt/csw/libexec/munin/plugins/bind9_rndc 0755 root bin
f none /opt/csw/libexec/munin/plugins/cmc_tc_sensor_ 0755 root bin
@@ -24,37 +39,51 @@
f none /opt/csw/libexec/munin/plugins/df_inode 0755 root bin
f none /opt/csw/libexec/munin/plugins/dhcpd3 0755 root bin
f none /opt/csw/libexec/munin/plugins/digitemp_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/ejabberd_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/env 0755 root bin
f none /opt/csw/libexec/munin/plugins/exim_mailqueue 0755 root bin
f none /opt/csw/libexec/munin/plugins/exim_mailqueue_alt 0755 root bin
f none /opt/csw/libexec/munin/plugins/exim_mailstats 0755 root bin
+f none /opt/csw/libexec/munin/plugins/extinfo_tester 0755 root bin
+f none /opt/csw/libexec/munin/plugins/fail2ban 0755 root bin
f none /opt/csw/libexec/munin/plugins/foldingathome 0755 root bin
f none /opt/csw/libexec/munin/plugins/foldingathome_rank 0755 root bin
f none /opt/csw/libexec/munin/plugins/foldingathome_wu 0755 root bin
+f none /opt/csw/libexec/munin/plugins/haproxy_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/hddtemp 0755 root bin
f none /opt/csw/libexec/munin/plugins/hddtemp2 0755 root bin
f none /opt/csw/libexec/munin/plugins/hddtemp_smartctl 0755 root bin
f none /opt/csw/libexec/munin/plugins/hddtempd 0755 root bin
f none /opt/csw/libexec/munin/plugins/http_loadtime 0755 root bin
+f none /opt/csw/libexec/munin/plugins/id 0755 root bin
f none /opt/csw/libexec/munin/plugins/if_ 0755 root bin
-f none /opt/csw/libexec/munin/plugins/if_errcoll_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/if_err_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/ifx_concurrent_sessions_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/io_busy_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/io_bytes_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/io_ops_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/iostat 0755 root bin
f none /opt/csw/libexec/munin/plugins/ipac-ng 0755 root bin
+f none /opt/csw/libexec/munin/plugins/ipmi_sensor_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/ircu 0755 root bin
+f none /opt/csw/libexec/munin/plugins/jmx_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/load 0755 root bin
f none /opt/csw/libexec/munin/plugins/loggrep 0755 root bin
f none /opt/csw/libexec/munin/plugins/lpstat 0755 root bin
f none /opt/csw/libexec/munin/plugins/mailman 0755 root bin
f none /opt/csw/libexec/munin/plugins/mailscanner 0755 root bin
f none /opt/csw/libexec/munin/plugins/mbmon_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/memcached_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/memory 0755 root bin
f none /opt/csw/libexec/munin/plugins/mhttping 0755 root bin
+f none /opt/csw/libexec/munin/plugins/multigraph_tester 0755 root bin
f none /opt/csw/libexec/munin/plugins/multiping 0755 root bin
f none /opt/csw/libexec/munin/plugins/multips 0755 root bin
f none /opt/csw/libexec/munin/plugins/munin_stats 0755 root bin
+f none /opt/csw/libexec/munin/plugins/munin_update 0755 root bin
+f none /opt/csw/libexec/munin/plugins/mysql_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/mysql_bytes 0755 root bin
+f none /opt/csw/libexec/munin/plugins/mysql_innodb 0755 root bin
f none /opt/csw/libexec/munin/plugins/mysql_isam_space_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/mysql_queries 0755 root bin
f none /opt/csw/libexec/munin/plugins/mysql_slowqueries 0755 root bin
@@ -62,6 +91,9 @@
f none /opt/csw/libexec/munin/plugins/named 0755 root bin
f none /opt/csw/libexec/munin/plugins/netopia 0755 root bin
f none /opt/csw/libexec/munin/plugins/netstat 0755 root bin
+f none /opt/csw/libexec/munin/plugins/nginx_request 0755 root bin
+f none /opt/csw/libexec/munin/plugins/nginx_status 0755 root bin
+f none /opt/csw/libexec/munin/plugins/nomadix_users_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/ntp_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/ntp_kernel_err 0755 root bin
f none /opt/csw/libexec/munin/plugins/ntp_kernel_pll_freq 0755 root bin
@@ -72,6 +104,7 @@
f none /opt/csw/libexec/munin/plugins/nut_volts 0755 root bin
f none /opt/csw/libexec/munin/plugins/nutups_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/nvidia_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/openvpn 0755 root bin
f none /opt/csw/libexec/munin/plugins/paging_in 0755 root bin
f none /opt/csw/libexec/munin/plugins/paging_out 0755 root bin
f none /opt/csw/libexec/munin/plugins/perdition 0755 root bin
@@ -83,23 +116,32 @@
f none /opt/csw/libexec/munin/plugins/postfix_mailqueue 0755 root bin
f none /opt/csw/libexec/munin/plugins/postfix_mailstats 0755 root bin
f none /opt/csw/libexec/munin/plugins/postfix_mailvolume 0755 root bin
-f none /opt/csw/libexec/munin/plugins/postgres_block_read_ 0755 root bin
-f none /opt/csw/libexec/munin/plugins/postgres_commits 0755 root bin
-f none /opt/csw/libexec/munin/plugins/postgres_commits_ 0755 root bin
-f none /opt/csw/libexec/munin/plugins/postgres_connections 0755 root bin
-f none /opt/csw/libexec/munin/plugins/postgres_locks 0755 root bin
-f none /opt/csw/libexec/munin/plugins/postgres_queries 0755 root bin
-f none /opt/csw/libexec/munin/plugins/postgres_queries_ 0755 root bin
-f none /opt/csw/libexec/munin/plugins/postgres_space_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_bgwriter 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_cache_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_checkpoints 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_connections_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_connections_db 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_locks_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_querylength_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_scans_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_size_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_transactions_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_tuples_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_users 0755 root bin
+f none /opt/csw/libexec/munin/plugins/postgres_xlog 0755 root bin
f none /opt/csw/libexec/munin/plugins/processes 0755 root bin
f none /opt/csw/libexec/munin/plugins/ps_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/psu_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/qmailqstat 0755 root bin
f none /opt/csw/libexec/munin/plugins/qmailscan 0755 root bin
f none /opt/csw/libexec/munin/plugins/qmailscan-simple 0755 root bin
f none /opt/csw/libexec/munin/plugins/samba 0755 root bin
f none /opt/csw/libexec/munin/plugins/sendmail_mailqueue 0755 root bin
f none /opt/csw/libexec/munin/plugins/sendmail_mailstats 0755 root bin
f none /opt/csw/libexec/munin/plugins/sendmail_mailtraffic 0755 root bin
+f none /opt/csw/libexec/munin/plugins/slapd_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/slapd_bdb_cache_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/slony_lag_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/smart_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__cpuload 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__df 0755 root bin
@@ -107,9 +149,14 @@
f none /opt/csw/libexec/munin/plugins/snmp__fc_if_err_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__if_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__if_err_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snmp__if_multi 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__load 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__memory 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snmp__netapp_diskusage_ 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snmp__netapp_inodeusage_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__netstat 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snmp__print_pages 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snmp__print_supplies 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__processes 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__rdp_users 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__sensors_fsc_bx_fan 0755 root bin
@@ -124,7 +171,14 @@
f none /opt/csw/libexec/munin/plugins/snmp__users 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__winload 0755 root bin
f none /opt/csw/libexec/munin/plugins/snmp__winmem 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snort_alerts 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snort_bytes_pkt 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snort_drop_rate 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snort_pattern_match 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snort_pkts 0755 root bin
+f none /opt/csw/libexec/munin/plugins/snort_traffic 0755 root bin
f none /opt/csw/libexec/munin/plugins/spamstats 0755 root bin
+f none /opt/csw/libexec/munin/plugins/squeezebox_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/squid_cache 0755 root bin
f none /opt/csw/libexec/munin/plugins/squid_icp 0755 root bin
f none /opt/csw/libexec/munin/plugins/squid_objectsize 0755 root bin
@@ -133,43 +187,76 @@
f none /opt/csw/libexec/munin/plugins/surfboard 0755 root bin
f none /opt/csw/libexec/munin/plugins/sybase_space 0755 root bin
f none /opt/csw/libexec/munin/plugins/temperature 0755 root bin
+f none /opt/csw/libexec/munin/plugins/tomcat_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/tomcat_access 0755 root bin
f none /opt/csw/libexec/munin/plugins/tomcat_jvm 0755 root bin
f none /opt/csw/libexec/munin/plugins/tomcat_threads 0755 root bin
f none /opt/csw/libexec/munin/plugins/tomcat_volume 0755 root bin
f none /opt/csw/libexec/munin/plugins/uptime 0755 root bin
f none /opt/csw/libexec/munin/plugins/users 0755 root bin
+f none /opt/csw/libexec/munin/plugins/varnish_ 0755 root bin
f none /opt/csw/libexec/munin/plugins/vmstat 0755 root bin
-f none /opt/csw/sbin/munin-node 0755 root bin
-f none /opt/csw/sbin/munin-node-configure 0755 root bin
-f none /opt/csw/sbin/munin-node-configure-snmp 0755 root bin
-f none /opt/csw/sbin/munin-run 0755 root bin
+f none /opt/csw/libexec/munin/plugins/warning_tester 0755 root bin
+f none /opt/csw/libexec/munin/plugins/zimbra_ 0755 root bin
+f none /opt/csw/sbin/munin-node 0555 root bin
+f none /opt/csw/sbin/munin-node-configure 0555 root bin
+f none /opt/csw/sbin/munin-run 0555 root bin
d none /opt/csw/share/doc/munin_node 0755 root bin
f none /opt/csw/share/doc/munin_node/license 0644 root bin
d none /opt/csw/share/man/man1 0755 root bin
+f none /opt/csw/share/man/man1/munin-node-configure.1 0444 root bin
+f none /opt/csw/share/man/man1/munin-node.1 0444 root bin
+f none /opt/csw/share/man/man1/munin-run.1 0444 root bin
+f none /opt/csw/share/man/man1/munindoc.1 0444 root bin
+d none /opt/csw/share/man/man3 0755 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Config.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Configure::Debug.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Configure::History.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Configure::HostEnumeration.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Configure::Plugin.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Configure::PluginList.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Logger.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::OS.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::SNMPConfig.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Server.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Service.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Session.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Node::Utils.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Plugin.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Plugin::Pgsql.3perl 0444 root bin
+f none /opt/csw/share/man/man3/Munin::Plugin::SNMP.3perl 0444 root bin
d none /opt/csw/share/man/man5 0755 root bin
f none /opt/csw/share/man/man5/munin-node.conf.5 0644 root bin
d none /opt/csw/share/man/man8 0755 root bin
-f none /opt/csw/share/man/man8/munin-node-configure-snmp.8 0644 root bin
-f none /opt/csw/share/man/man8/munin-node-configure.8 0644 root bin
-f none /opt/csw/share/man/man8/munin-node.8 0644 root bin
-f none /opt/csw/share/man/man8/munin-run.8 0644 root bin
+f none /opt/csw/share/man/man8/munin.8 0644 root bin
+d none /opt/csw/share/munin 0755 root bin
d none /opt/csw/share/perl 0755 root bin
d none /opt/csw/share/perl/site_perl 0755 root bin
d none /opt/csw/share/perl/site_perl/Munin 0755 root bin
+d none /opt/csw/share/perl/site_perl/Munin/Node 0755 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Config.pm 0444 root bin
+d none /opt/csw/share/perl/site_perl/Munin/Node/Configure 0755 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/Debug.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/History.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/HostEnumeration.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/Plugin.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/PluginList.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Logger.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/OS.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/SNMPConfig.pm 0555 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Server.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Service.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Session.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Node/Utils.pm 0444 root bin
d none /opt/csw/share/perl/site_perl/Munin/Plugin 0755 root bin
-f none /opt/csw/share/perl/site_perl/Munin/Plugin.pm 0644 root bin
-d none /var/opt/csw/munin 0755 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Plugin.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Plugin/Pgsql.pm 0444 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Plugin/SNMP.pm 0444 root bin
+d ugfiles /var/opt/csw/munin 0755 munin munin
+d ugfiles /var/opt/csw/munin/db 0755 munin munin
+d ugfiles /var/opt/csw/munin/log 0755 munin munin
+d ugfiles /var/opt/csw/munin/run 0755 munin munin
s none /etc/opt/csw/munin/plugins/load=/opt/csw/libexec/munin/plugins/load
s none /etc/opt/csw/munin/plugins/uptime=/opt/csw/libexec/munin/plugins/uptime
s none /etc/opt/csw/munin/plugins/cpu=/opt/csw/libexec/munin/plugins/cpu
s none /etc/opt/csw/munin/plugins/df=/opt/csw/libexec/munin/plugins/df
-d ugfiles /var/opt/csw/munin/log 0755 munin munin
-d ugfiles /var/opt/csw/munin/run 0755 munin munin
-d ugfiles /var/opt/csw/munin/db 0755 munin munin
-d ugfiles /var/opt/csw/munin/db/plugin-state 0755 munin munin
-d none /opt/csw/etc/pkg 0755 root bin
-d none /opt/csw/etc/pkg/CSWmuninnode 0755 root bin
-d none /etc/opt/csw/init.d 0755 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswmuninnode 0755 root bin
-f cswusergroup /opt/csw/etc/pkg/CSWmuninnode/cswusergroup 0644 root bin
Modified: csw/mgar/pkg/munin/trunk/files/makefile.config.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,9 +1,9 @@
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/Makefile.config munin-1.3.4/Makefile.config
---- munin-1.3.4.orig/Makefile.config 2008-03-08 07:35:13.000000000 +0100
-+++ munin-1.3.4/Makefile.config 2009-07-05 11:01:24.956040045 +0200
-@@ -6,13 +6,15 @@
- # DESTDIR is empty during building, and optionally set to point to
- # a shadow tree during make install.
+diff --speed-large-files --minimal -Nru munin-1.4.0.orig/Makefile.config munin-1.4.0/Makefile.config
+--- munin-1.4.0.orig/Makefile.config 2009-11-27 12:17:18.000000000 +0100
++++ munin-1.4.0/Makefile.config 2009-11-28 16:51:45.380818848 +0100
+@@ -14,13 +14,15 @@
+ # and LOGDIR as subdirectories. Today, DBDIR contains configured
+ # domains, as well as PLUGSTATE, and we risk collisions.
+DESTDIR=$(DESTDIR)
+
@@ -19,7 +19,7 @@
# Server only - where to put munin-cron
BINDIR = $(PREFIX)/bin
-@@ -21,37 +23,37 @@
+@@ -29,17 +31,17 @@
SBINDIR = $(PREFIX)/sbin
# Where to put text and html documentation
@@ -35,10 +35,16 @@
+LIBDIR = $(PREFIX)/libexec/munin
# Server only - Output directory
--HTMLDIR = $(PREFIX)/var/www
+-HTMLDIR = $(PREFIX)/www/docs
+-CGIDIR = $(PREFIX)/www/cgi
+HTMLDIR = /var/opt/csw/munin/www
- CGIDIR = $(HTMLDIR)/cgi
++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
@@ -48,7 +54,7 @@
PLUGSTATE = $(DBDIR)/plugin-state
# Where Munin should place its logs.
--LOGDIR = $(DESTDIR)/var/log/munin
+-LOGDIR = $(PREFIX)/log/munin
+LOGDIR = /var/opt/csw/munin/log
# Location of PID files and other statefiles. On the server, must be
@@ -57,54 +63,54 @@
+STATEDIR = /var/opt/csw/munin/run
# The perl interpreter to use
--PERL = $(shell which perl)
-+PERL = /opt/csw/bin/perl
+-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
+-PYTHON := /usr/bin/env python
++PYTHON := /opt/csw/bin/python
- # A modern (posix) shell. We're not looking for arrays, but $() and
- # other modern stuff is expected. On a posix-system the expression
-@@ -64,10 +66,10 @@
- GOODSH = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
+ # 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
+-BASH := /bin/bash
++BASH := /usr/bin/bash
# Server only - Where to install the perl libraries
--PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+ 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]')
-@@ -79,7 +81,7 @@
+ 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)
+-MKTEMP := $(shell ./test-mktemp)
++MKTEMP := $(shell mktemp)
# Munin version number.
- VERSION = $(shell cat RELEASE)
-@@ -94,9 +96,9 @@
+ 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) nonexistant. Create the user and retry; exit 2"))
--CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
-+#GETENT = $(shell which getent || which true 2>/dev/null)
-+#CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
-+#CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
+-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
#
-@@ -117,5 +119,5 @@
- CHGRP = chgrp
+@@ -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;' )
-
+-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;' )
Modified: csw/mgar/pkg/munin/trunk/files/makefile.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/makefile.diff 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/makefile.diff 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,293 +1,167 @@
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/Makefile munin-1.3.4/Makefile
---- munin-1.3.4.orig/Makefile 2008-03-08 07:50:16.000000000 +0100
-+++ munin-1.3.4/Makefile 2009-07-01 23:52:36.445587463 +0200
-@@ -28,74 +28,71 @@
+diff --speed-large-files --minimal -Nru munin-1.4.0.orig/Makefile munin-1.4.0/Makefile
+--- munin-1.4.0.orig/Makefile 2009-11-27 12:17:18.000000000 +0100
++++ munin-1.4.0/Makefile 2009-11-28 18:13:47.250778081 +0100
+@@ -49,8 +49,8 @@
# This removes the installed config so that the next install-pass installs
- # a new config. Target suitable for maintainers
+ # 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
- install-main: build
-- $(CHECKUSER)
+ tags:
+ -rm -f TAGS
+@@ -66,50 +66,47 @@
+
+ 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 $(LOGDIR)
-- mkdir -p $(STATEDIR)
+- mkdir -p $(PERLLIB)/Munin/Master
- mkdir -p $(HTMLDIR)
- mkdir -p $(DBDIR)
- mkdir -p $(CGIDIR)
+-
+- $(CHOWN) $(USER) $(HTMLDIR) $(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)
-
-- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
-+ mkdir -p $(DESTDIR)$(LOGDIR)
-+ mkdir -p $(DESTDIR)$(STATEDIR)
++ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master
+ mkdir -p $(DESTDIR)$(HTMLDIR)
+ mkdir -p $(DESTDIR)$(DBDIR)
+ mkdir -p $(DESTDIR)$(CGIDIR)
- for p in build/server/*.tmpl; do \
+ 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
-- $(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/
-- $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
-- $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
-- $(INSTALL) -m 0755 server/VeraMono.ttf $(LIBDIR)/
-- $(INSTALL) -m 0644 resources/favicon.ico $(HTMLDIR)/
-- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(HTMLDIR)/.htaccess
-- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
-- $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
-- $(INSTALL) -m 0755 build/server/munin-check $(BINDIR)/
-- $(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/
-- $(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/
-- $(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/
-- $(INSTALL) -m 0755 build/server/munin-limits $(LIBDIR)/
-- $(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/
-- $(INSTALL) -m 0644 build/server/Munin.pm $(PERLLIB)/
-+ $(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/
-+ $(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/
-+ $(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/
-+ $(INSTALL) -m 0755 server/VeraMono.ttf $(DESTDIR)$(LIBDIR)/
-+ $(INSTALL) -m 0644 resources/favicon.ico $(DESTDIR)$(HTMLDIR)/
-+ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
-+ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/
-+ $(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/
-+ $(INSTALL) -m 0755 build/server/munin-check $(DESTDIR)$(BINDIR)/
-+ $(INSTALL) -m 0755 build/server/munin-update $(DESTDIR)$(LIBDIR)/
-+ $(INSTALL) -m 0755 build/server/munin-graph $(DESTDIR)$(LIBDIR)/
-+ $(INSTALL) -m 0755 build/server/munin-html $(DESTDIR)$(LIBDIR)/
-+ $(INSTALL) -m 0755 build/server/munin-limits $(DESTDIR)$(LIBDIR)/
-+ $(INSTALL) -m 0755 build/server/munin-cgi-graph $(DESTDIR)$(CGIDIR)/
-+ $(INSTALL) -m 0644 build/server/Munin.pm $(DESTDIR)$(PERLLIB)/
- uninstall-main: build
- for p in build/server/*.tmpl; do \
-- rm -f $(CONFDIR)/templates/"$$p" ; \
-+ rm -f $(DESTDIR)$(CONFDIR)/templates/"$$p" ; \
+ for p in master/www/partial/*.tmpl; do \
+- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \
done
-- rm -f $(CONFDIR)/templates/logo.png
-- rm -f $(CONFDIR)/templates/style.css
-- rm -f $(CONFDIR)/templates/definitions.html
-- rm -f $(HTMLDIR)/.htaccess
-+ rm -f $(DESTDIR)$(CONFDIR)/templates/logo.png
-+ rm -f $(DESTDIR)$(CONFDIR)/templates/style.css
-+ rm -f $(DESTDIR)$(CONFDIR)/templates/definitions.html
-+ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
-- rm -f $(CONFDIR)/munin.conf
-+ rm -f $(DESTDIR)$(CONFDIR)/munin.conf
+- $(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/
+- $(INSTALL) -m 0755 master/VeraMono.ttf $(LIBDIR)/
++ $(INSTALL) -m 0644 master/www/definitions.html $(DESTDIR)$(CONFDIR)/templates/
++ $(INSTALL) -m 0755 master/VeraMono.ttf $(DESTDIR)$(LIBDIR)/
-- rm -f $(BINDIR)/munin-cron
-- rm -f $(BINDIR)/munin-check
-+ rm -f $(DESTDIR)$(BINDIR)/munin-cron
-+ rm -f $(DESTDIR)$(BINDIR)/munin-check
+- 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)/
-- rm -f $(LIBDIR)/munin-update
-- rm -f $(LIBDIR)/munin-graph
-- rm -f $(LIBDIR)/munin-html
-- rm -f $(LIBDIR)/munin-limits
-+ rm -f $(DESTDIR)$(LIBDIR)/munin-update
-+ rm -f $(DESTDIR)$(LIBDIR)/munin-graph
-+ rm -f $(DESTDIR)$(LIBDIR)/munin-html
-+ rm -f $(DESTDIR)$(LIBDIR)/munin-limits
- rm -f $(CGIDIR)/munin-cgi-graph
+- $(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)/
-- rm -f $(PERLLIB)/Munin.pm
-- -rmdir $(CONFDIR)/templates
-- -rmdir $(CONFDIR)
-- -rmdir $(LIBDIR)
-- -rmdir $(BINDIR)
-+ rm -f $(DESTDIR)$(PERLLIB)/Munin.pm
-+ -rmdir $(DESTDIR)$(CONFDIR)/templates
-+ -rmdir $(DESTDIR)$(CONFDIR)
-+ -rmdir $(DESTDIR)$(LIBDIR)
-+ -rmdir $(DESTDIR)$(BINDIR)
+ # 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)/
-- -rmdir $(LOGDIR)
-- -rmdir $(STATEDIR)
-- -rmdir $(HTMLDIR)
-- -rmdir $(DBDIR)
-- -rmdir $(CGIDIR)
-+ -rmdir $(DESTDIR)$(LOGDIR)
-+ -rmdir $(DESTDIR)$(STATEDIR)
-+ -rmdir $(DESTDIR)$(HTMLDIR)
-+ -rmdir $(DESTDIR)$(DBDIR)
-+ -rmdir $(DESTDIR)$(CGIDIR)
+ # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
+ # GENERIC ONES
+@@ -120,28 +117,24 @@
+ install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
+ @$(CHECKGROUP)
- install-node: build install-node-non-snmp install-node-snmp install-munindoc
- echo Done.
-@@ -104,44 +101,43 @@
- echo Undone.
-
- install-node-snmp: build
-- $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/
-+ $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/
-
- install-munindoc: build
-- $(INSTALL) -m 0755 build/node/munindoc $(BINDIR)/
-+ $(INSTALL) -m 0755 build/node/munindoc $(DESTDIR)$(BINDIR)/
-
- uninstall-node-snmp: build
-- rm -f $(SBINDIR)/munin-node-configure-snmp
-- -rmdir $(SBINDIR)
-+ rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure-snmp
-+ -rmdir $(DESTDIR)$(SBINDIR)
-
- install-node-non-snmp: build
- $(CHECKGROUP)
- mkdir -p $(CONFDIR)/plugins
- mkdir -p $(CONFDIR)/plugin-conf.d
- mkdir -p $(LIBDIR)/plugins
-- mkdir -p $(SBINDIR)
-- mkdir -p $(PERLLIB)/Munin/Plugin
+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins
+ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
+ mkdir -p $(DESTDIR)$(LIBDIR)/plugins
-+ mkdir -p $(DESTDIR)$(SBINDIR)
-+ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Plugin
+ mkdir -p $(PLUGSTATE)
-- mkdir -p $(LOGDIR)
-- mkdir -p $(STATEDIR)
-- mkdir -p $(PLUGSTATE)
-+ mkdir -p $(DESTDIR)$(LOGDIR)
-+ mkdir -p $(DESTDIR)$(STATEDIR)
-+ mkdir -p $(DESTDIR)$(PLUGSTATE)
-
- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
- $(CHMOD) 0775 $(PLUGSTATE)
- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
-+ $(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE)
-+ $(CHMOD) 0755 $(DESTDIR)$(CONFDIR)/plugin-conf.d
-
-- $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
-- $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/
-- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
-- $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/
-+ $(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/
-+ $(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/
-+ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
-+ $(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/
-
- uninstall-node-non-snmp: build
-- rm -f $(SBINDIR)/munin-node
-- rm -f $(SBINDIR)/munin-node-configure
-- rm -f $(CONFDIR)/munin-node.conf
-- rm -f $(SBINDIR)/munin-run
-- -rmdir $(CONFDIR)/plugin-conf.d
-- -rmdir $(CONFDIR)
-- -rmdir $(SBINDIR)
-+ rm -f $(DESTDIR)$(SBINDIR)/munin-node
-+ rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure
-+ rm -f $(DESTDIR)$(CONFDIR)/munin-node.conf
-+ rm -f $(DESTDIR)$(SBINDIR)/munin-run
-+ -rmdir $(DESTDIR)$(CONFDIR)/plugin-conf.d
-+ -rmdir $(DESTDIR)$(CONFDIR)
-+ -rmdir $(DESTDIR)$(SBINDIR)
-
-
- # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
-@@ -156,67 +152,67 @@
- if echo $(INSTALL_PLUGINS) | \
- grep $$family >/dev/null; then \
- echo Installing $$p; \
-- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \
-+ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \
- fi; \
- fi \
+-
+ 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)
-- -mkdir -p $(PLUGSTATE)
-- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
-- $(CHMOD) 0775 $(PLUGSTATE)
-- $(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/
-- $(INSTALL) -m 0644 build/node/plugin.sh $(LIBDIR)/plugins/
-- mkdir -p $(PERLLIB)/Munin
-- $(INSTALL) -m 0644 build/node/Plugin.pm $(PERLLIB)/Munin/
-+ #-mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(LIBDIR)
-+ -mkdir -p $(DESTDIR)$(PLUGSTATE)
-+ #$(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE)
-+ $(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE)
-+ $(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
-+ $(INSTALL) -m 0644 build/node/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/
-+ mkdir -p $(DESTDIR)$(PERLLIB)/Munin
-+ $(INSTALL) -m 0644 build/node/Plugin.pm $(DESTDIR)$(PERLLIB)/Munin/
+- $(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/
- uninstall-node-plugins: build $(PLUGINS)
- for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \
-- rm -f $(LIBDIR)/plugins/`basename $$p` \
-+ rm -f $(DESTDIR)$(LIBDIR)/plugins/`basename $$p` \
- done
-- rm -f $(LIBDIR)/plugins/plugins.history
-- rm -f $(LIBDIR)/plugins/plugin.sh
-- -rm -f $(LIBDIR)/*.adv
-+ rm -f $(DESTDIR)$(LIBDIR)/plugins/plugins.history
-+ rm -f $(DESTDIR)$(LIBDIR)/plugins/plugin.sh
-+ -rm -f $(DESTDIR)$(LIBDIR)/*.adv
+ 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
- # or the packager.
+@@ -150,30 +143,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-node.8 $(MANDIR)/man8/
-- $(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(MANDIR)/man8/
-- $(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(MANDIR)/man8/
-- $(INSTALL) -m 0644 build/doc/munin-run.8 $(MANDIR)/man8/
- $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
- $(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/
- $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
- $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
- $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
+- $(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-node.8 $(DESTDIR)$(MANDIR)/man8/
-+ $(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(DESTDIR)$(MANDIR)/man8/
-+ $(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(DESTDIR)$(MANDIR)/man8/
-+ $(INSTALL) -m 0644 build/doc/munin-run.8 $(DESTDIR)$(MANDIR)/man8/
+ $(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/
+ $(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/
+ $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
+ $(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/
+ $(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/
- uninstall-man: build-man
-- rm -f $(MANDIR)/man5/munin-node.conf.5
-- rm -f $(MANDIR)/man5/munin.conf.5
-- rm -f $(MANDIR)/man8/munin-node.8
-- rm -f $(MANDIR)/man8/munin-node-configure.8
-- rm -f $(MANDIR)/man8/munin-node-configure-snmp.8
-- rm -f $(MANDIR)/man8/munin-run.8
-- rm -f $(MANDIR)/man8/munin-graph.8
-- rm -f $(MANDIR)/man8/munin-update.8
-- rm -f $(MANDIR)/man8/munin-limits.8
-- rm -f $(MANDIR)/man8/munin-html.8
-- rm -f $(MANDIR)/man8/munin-cron.8
-- -rmdir $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 $(MANDIR)
-+ rm -f $(DESTDIR)$(MANDIR)/man5/munin-node.conf.5
-+ rm -f $(DESTDIR)$(MANDIR)/man5/munin.conf.5
-+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node.8
-+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure.8
-+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure-snmp.8
-+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-run.8
-+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-graph.8
-+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-update.8
-+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-limits.8
-+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-html.8
-+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-cron.8
-+ -rmdir $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)
install-doc: build-doc
- mkdir -p $(DOCDIR)/resources
@@ -299,18 +173,14 @@
+ $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/
+ $(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources
- uninstall-doc: build-doc
-- rm -rf $(DOCDIR)
-+ rm -rf $(DESTDIR)$(DOCDIR)
+ ######################################################################
- build: build-stamp
-
-@@ -363,20 +359,20 @@
+@@ -370,20 +363,20 @@
$(MAKE) $@ CONFIG=t/Makefile.config
else
test_plugins = id_default id_root env
--test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
-+test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins))
+-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;\
@@ -334,3 +204,22 @@
echo 'Done?'
t/install:
+@@ -407,12 +400,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
Modified: csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,16 +1,18 @@
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin-graph.in munin-1.3.4/server/munin-graph.in
---- munin-1.3.4.orig/server/munin-graph.in 2008-03-08 02:42:40.000000000 +0100
-+++ munin-1.3.4/server/munin-graph.in 2009-08-13 20:59:35.901535076 +0200
-@@ -827,9 +827,9 @@
- my @complete = ();
- if ($RRDkludge) {
- push (@complete,
-- '--font' ,'LEGEND:7:@@LIBDIR@@/VeraMono.ttf',
-- '--font' ,'UNIT:7:@@LIBDIR@@/VeraMono.ttf',
-- '--font' ,'AXIS:7:@@LIBDIR@@/VeraMono.ttf');
-+ '--font' ,'LEGEND:7:@@LIBDIR@@/monospace',
-+ '--font' ,'UNIT:7:/opt/csw/share/munin/fonts/VeraMono.ttf',
-+ '--font' ,'AXIS:7:/opt/csw/share/munin/fonts/VeraMono.ttf');
- }
- push(@complete,'-W', $watermark) if $RRDs::VERSION >= 1.2;
+diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/_bin/munin-graph.in munin-1.4.0/master/_bin/munin-graph.in
+--- munin-1.4.0.orig/master/_bin/munin-graph.in 2009-11-27 12:17:18.000000000 +0100
++++ munin-1.4.0/master/_bin/munin-graph.in 2009-11-28 13:41:02.135025435 +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
+
Modified: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,7 +1,7 @@
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/munin-node.conf.in munin-1.3.4/node/munin-node.conf.in
---- munin-1.3.4.orig/node/munin-node.conf.in 2008-03-08 02:42:39.000000000 +0100
-+++ munin-1.3.4/node/munin-node.conf.in 2009-07-05 08:45:56.286530895 +0200
-@@ -25,7 +25,7 @@
+diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/munin-node.conf.in munin-1.4.0/node/munin-node.conf.in
+--- munin-1.4.0.orig/node/munin-node.conf.in 2009-11-27 12:17:13.000000000 +0100
++++ munin-1.4.0/node/munin-node.conf.in 2009-11-28 11:59:12.681167885 +0100
+@@ -26,7 +26,7 @@
# Set this if the client doesn't report the correct hostname when
# telnetting to localhost, port 4949
#
@@ -9,4 +9,4 @@
+#host_name yourhostname
# A list of addresses that are allowed to connect. This must be a
- # regular expression, due to brain damage in Net::Server, which
+ # regular expression, since Net::Server does not understand CIDR-style
Deleted: csw/mgar/pkg/munin/trunk/files/munin-update.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-update.in.diff 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/munin-update.in.diff 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin-update.in munin-1.3.4/server/munin-update.in
---- munin-1.3.4.orig/server/munin-update.in 2008-03-08 02:42:40.000000000 +0100
-+++ munin-1.3.4/server/munin-update.in 2009-07-07 22:15:31.832187072 +0200
-@@ -931,7 +931,7 @@
- eval {
- local $SIG{ALRM} = sub { die "Could not run list on $name ($fetchdomain): $!\n"};
- alarm 5; # Should be enough to check the list
-- write_socket_single ($socket, "list $fetchdomain\n");
-+ write_socket_single ($socket, "list $name\n");
- my $list = read_socket_single ($socket);
- exit 1 unless defined $list;
- chomp $list;
Modified: csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,12 +1,12 @@
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin.conf.in munin-1.3.4/server/munin.conf.in
---- munin-1.3.4.orig/server/munin.conf.in 2008-03-08 02:42:40.000000000 +0100
-+++ munin-1.3.4/server/munin.conf.in 2009-07-06 00:16:45.205126727 +0200
-@@ -31,7 +31,7 @@
+diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/munin.conf.in munin-1.4.0/master/munin.conf.in
+--- munin-1.4.0.orig/master/munin.conf.in 2009-11-27 12:17:18.000000000 +0100
++++ munin-1.4.0/master/munin.conf.in 2009-11-28 12:03:14.865737210 +0100
+@@ -57,7 +57,7 @@
#contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
# a simple host tree
-[@@HOSTNAME@@]
-+[HOSTNAME]
++[yourhostname]
address 127.0.0.1
use_node_name yes
Deleted: csw/mgar/pkg/munin/trunk/files/munindoc.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munindoc.in.diff 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/munindoc.in.diff 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,9 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/munindoc.in munin-1.3.4/node/munindoc.in
---- munin-1.3.4.orig/node/munindoc.in 2008-03-08 02:42:39.000000000 +0100
-+++ munin-1.3.4/node/munindoc.in 2009-08-02 11:31:16.881795848 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!@@PERL@@ -w
- # -*- perl -*-
- #
- # This script provides the basis for a plugin documentation system for
Added: csw/mgar/pkg/munin/trunk/files/perl.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/perl.diff (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/perl.diff 2009-11-28 20:17:10 UTC (rev 7501)
@@ -0,0 +1,45 @@
+diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/_bin/munin-update.in munin-1.4.0/master/_bin/munin-update.in
+--- munin-1.4.0.orig/master/_bin/munin-update.in 2009-11-27 12:17:18.000000000 +0100
++++ munin-1.4.0/master/_bin/munin-update.in 2009-11-28 19:30:06.713647230 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#!@@PERL@@
+
+ use warnings;
+ use strict;
+diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/bin/munindoc munin-1.4.0/node/bin/munindoc
+--- munin-1.4.0.orig/node/bin/munindoc 2009-11-27 12:17:13.000000000 +0100
++++ munin-1.4.0/node/bin/munindoc 2009-11-28 19:28:26.453064302 +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.0.orig/node/sbin/munin-node munin-1.4.0/node/sbin/munin-node
+--- munin-1.4.0.orig/node/sbin/munin-node 2009-11-27 12:17:13.000000000 +0100
++++ munin-1.4.0/node/sbin/munin-node 2009-11-28 19:28:26.455172374 +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.0.orig/node/sbin/munin-node-configure munin-1.4.0/node/sbin/munin-node-configure
+--- munin-1.4.0.orig/node/sbin/munin-node-configure 2009-11-27 12:17:13.000000000 +0100
++++ munin-1.4.0/node/sbin/munin-node-configure 2009-11-28 19:28:26.457840168 +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.0.orig/node/sbin/munin-run munin-1.4.0/node/sbin/munin-run
+--- munin-1.4.0.orig/node/sbin/munin-run 2009-11-27 12:17:13.000000000 +0100
++++ munin-1.4.0/node/sbin/munin-run 2009-11-28 19:28:26.459939564 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -wT
++#!/opt/csw/bin/perl -wT
+ # -*- perl -*-
+
+ # Copyright (C) 2004-2009
Deleted: csw/mgar/pkg/munin/trunk/files/perlpath.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/perlpath.diff 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/perlpath.diff 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,26 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d/exim_mailstats.in munin-1.3.4/node/node.d/exim_mailstats.in
---- munin-1.3.4.orig/node/node.d/exim_mailstats.in 2008-03-08 02:42:39.000000000 +0100
-+++ munin-1.3.4/node/node.d/exim_mailstats.in 2009-08-02 11:26:39.040437174 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/perl -w
- #!@@PERL@@ -w
- # -*- perl -*-
-
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d/lpstat.in munin-1.3.4/node/node.d/lpstat.in
---- munin-1.3.4.orig/node/node.d/lpstat.in 2008-03-08 02:42:39.000000000 +0100
-+++ munin-1.3.4/node/node.d/lpstat.in 2009-08-02 11:26:48.080049173 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@@PERL@@ -w
- #############################################################################
- # #
- # This script was initially developed by Anstat Pty Ltd for internal use #
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d/snmp__cpuload.in munin-1.3.4/node/node.d/snmp__cpuload.in
---- munin-1.3.4.orig/node/node.d/snmp__cpuload.in 2008-03-08 02:42:39.000000000 +0100
-+++ munin-1.3.4/node/node.d/snmp__cpuload.in 2009-08-02 11:26:57.614639171 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!@@PERL@@ -w
- #
- # Copyright (C) 2006 Lars Strand
- #
Modified: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2009-11-28 19:54:43 UTC (rev 7500)
+++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2009-11-28 20:17:10 UTC (rev 7501)
@@ -1,10 +1,19 @@
-diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d.sunos/memory.in munin-1.3.4/node/node.d.sunos/memory.in
---- munin-1.3.4.orig/node/node.d.sunos/memory.in 2008-03-08 02:42:39.000000000 +0100
-+++ munin-1.3.4/node/node.d.sunos/memory.in 2009-07-03 11:50:10.815859151 +0200
-@@ -11,7 +11,7 @@
- # FIXME1: Reporting size in MB is Wrong. Report bytes and let rrd scale units
- # FIXME2: Using kstat would be much better!
+diff --speed-large-files --minimal -Nru munin-1.4.0.orig/plugins/node.d.sunos/memory.in munin-1.4.0/plugins/node.d.sunos/memory.in
+--- munin-1.4.0.orig/plugins/node.d.sunos/memory.in 2009-11-27 12:17:12.000000000 +0100
++++ munin-1.4.0/plugins/node.d.sunos/memory.in 2009-11-28 11:53:12.048911726 +0100
+@@ -15,7 +15,7 @@
+ =item top
+
+-The path to "top" (Default: "/usr/local/bin/top")
++The path to "top" (Default: "/opt/csw/bin/top")
+
+ =back
+
+@@ -50,7 +50,7 @@
+
+ . $MUNIN_LIBDIR/plugins/plugin.sh
+
-TOP=${top:-/usr/local/bin/top}
+TOP=${top:-/opt/csw/bin/top}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list