[csw-devel] SF.net SVN: gar:[15576] csw/mgar/pkg/munin/trunk/Makefile

j_arndt at users.sourceforge.net j_arndt at users.sourceforge.net
Thu Sep 8 21:19:42 CEST 2011 

Revision: 15576
          http://gar.svn.sourceforge.net/gar/?rev=15576&view=rev
Author:   j_arndt
Date:     2011-09-08 19:19:41 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
munin: rebuild with prototype filters, changed pkg name to match catalog name

Modified Paths:
--------------
    csw/mgar/pkg/munin/trunk/Makefile

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2011-09-08 17:32:18 UTC (rev 15575)
+++ csw/mgar/pkg/munin/trunk/Makefile	2011-09-08 19:19:41 UTC (rev 15576)
@@ -1,12 +1,10 @@
-# $Id$
-
 NAME = munin
 VERSION = 1.4.6
 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_CSWmunincommon = Common files for munin node and master
+SPKG_DESC_CSWmunin-master = Master component of the graphical network and system monitoring munin
+SPKG_DESC_CSWmunin-node = Node component of the graphical network and system monitoring munin
+SPKG_DESC_CSWmunin-common = 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.
@@ -16,9 +14,6 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += cswmuninnode
-DISTFILES += CSWmuninnode.prototype
-DISTFILES += CSWmunincommon.prototype
-DISTFILES += CSWmuninmaster.prototype
 DISTFILES += cswusergroup
 DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW
 DISTFILES += README.CSW
@@ -32,35 +27,131 @@
 PATCHFILES += munin-graph.in.patch # match some paths to /{etc|var}/opt/csw/munin 
 PATCHFILES += perl.patch # shebang correctly set
 
-PACKAGES = CSWmuninmaster CSWmuninnode CSWmunincommon
-CATALOGNAME_CSWmuninmaster = munin_master
-CATALOGNAME_CSWmuninnode = munin_node
-CATALOGNAME_CSWmunincommon = munin_common
+PACKAGES = CSWmunin-master CSWmunin-node CSWmunin-common
+CATALOGNAME_CSWmunin-master = munin_master
+CATALOGNAME_CSWmunin-node = munin_node
+CATALOGNAME_CSWmunin-common = munin_common
 
-ARCHALL_CSWmuninmaster = 1
-ARCHALL_CSWmuninnode = 1
-ARCHALL_CSWmunincommon = 1
+ARCHALL_CSWmunin-master = 1
+ARCHALL_CSWmunin-node = 1
+ARCHALL_CSWmunin-common = 1
 
-RUNTIME_DEP_PKGS_CSWmunincommon = CSWperl
+RUNTIME_DEP_PKGS_CSWmunin-common = CSWperl
 
-RUNTIME_DEP_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon
-RUNTIME_DEP_PKGS_CSWmuninmaster += CSWpm-rrdtool CSWapache2 
+RUNTIME_DEP_PKGS_CSWmunin-master = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunin-common
+RUNTIME_DEP_PKGS_CSWmunin-master += CSWpm-rrdtool CSWapache2 
 
-RUNTIME_DEP_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon
-RUNTIME_DEP_PKGS_CSWmuninnode += CSWpmnetssleay
+RUNTIME_DEP_PKGS_CSWmunin-node = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunin-common
+RUNTIME_DEP_PKGS_CSWmunin-node += CSWpmnetssleay
 
-SPKG_CLASSES_CSWmuninmaster = none cswusergroup ugfiles cswcrontab cswcptemplates cswpostmsg
-SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswcptemplates cswinitsmf 
-SPKG_CLASSES_CSWmunincommon = none
+############### Prototype filters for the different packages ###############
 
+#
+# files for CSWmunin-common
+#
 
+PKGFILES_CSWmunin-common += .*/Munin::Common.*
+PKGFILES_CSWmunin-common += .*/Munin/Common.*
+PKGFILES_CSWmunin-common += .*munin_common.*
+
 #
+# files for CSWmunin-node
+#
+
+MUNINNODE_UGFILES 	= /var/opt/csw/munin /var/opt/csw/munin/log /var/opt/csw/munin/db /var/opt/csw/munin/run
+MUNINNODE_SMF		= /etc/opt/csw/init.d/cswmuninnode
+MUNINNODE_USERGROUP	= /opt/csw/etc/pkg/CSWmunin-node/cswusergroup
+MUNINNODE_EXECS		= .*munin-node.*[^\.tmpl]$ .*munin-node-configure.* .*munindoc.* .*munin-run.*
+
+PKGFILES_CSWmunin-node += .*muninnode.*
+PKGFILES_CSWmunin-node += .*plugins.*
+PKGFILES_CSWmunin-node += .*Munin::Node.*
+PKGFILES_CSWmunin-node += .*Munin/Node.*
+PKGFILES_CSWmunin-node += $(MUNINNODE_UGFILES)
+PKGFILES_CSWmunin-node += $(MUNINNODE_SMF)
+PKGFILES_CSWmunin-node += $(MUNINNODE_USERGROUP)
+PKGFILES_CSWmunin-node += $(MUNINNODE_EXECS)
+
+PROTOTYPE_MODIFIERS = muninnode_ugfiles
+
+PROTOTYPE_FILES_muninnode_ugfiles = $(MUNINNODE_UGFILES)
+PROTOTYPE_USER_muninnode_ugfiles = munin
+PROTOTYPE_GROUP_muninnode_ugfiles = munin
+PROTOTYPE_CLASS_muninnode_ugfiles = ugfiles
+
+#
+# files for CSWmunin-master
+#
+
+MUNINMASTER_UGFILES	= /var/opt/csw/munin.*
+MUNINMASTER_USERGROUP	= /opt/csw/etc/pkg/CSWmunin-master/cswusergroup
+MUNINMASTER_EXECS	= .*munin-check.* .*munin-cron.* .*munin-graph.* .*munin-html.* .*munin-limits.* .*munin-update.*
+MUNINMASTER_FONTS	= .*ttf.*
+MUNINMASTER_CRONTABS	= /etc/opt/csw/pkg/CSWmunin-master/crontabs/munin
+MUNINMASTER_POSTMSG	= /opt/csw/share/doc/munin_master/README.CSW
+
+PKGFILES_CSWmunin-master += .*muninmaster.*
+PKGFILES_CSWmunin-master += .*Munin::Master.*
+PKGFILES_CSWmunin-master += .*munin_master.*
+PKGFILES_CSWmunin-master += .*Munin/Master.*
+PKGFILES_CSWmunin-master += $(MUNINMASTER_UGFILES) 
+PKGFILES_CSWmunin-master += $(MUNINMASTER_USERGROUP) 
+PKGFILES_CSWmunin-master += $(MUNINMASTER_EXECS) 
+PKGFILES_CSWmunin-master += $(MUNINMASTER_FONTS)
+
+PROTOTYPE_MODIFIERS = muninmaster_ugfiles
+
+PROTOTYPE_FILES_muninmaster_ugfiles = $(MUNINMASTER_UGFILES)
+PROTOTYPE_USER_muninmaster_ugfiles = munin
+PROTOTYPE_GROUP_muninmaster_ugfiles = munin
+PROTOTYPE_CLASS_muninmaster_ugfiles = ugfiles
+
+############### End of prototype filters for the different packages ###############
+
+INITSMF 	+= $(MUNINNODE_SMF)
+USERGROUP	+= $(MUNINNODE_USERGROUP)
+USERGROUP	+= $(MUNINMASTER_USERGROUP)
+POSTMSG		+= $(MUNINMASTER_POSTMSG)
+CRONTABS	+= $(MUNINMASTER_CRONTABS)
+
+#SPKG_CLASSES_CSWmunin-master = none cswusergroup ugfiles cswcrontab cswcptemplates cswpostmsg
+#SPKG_CLASSES_CSWmunin-node = none cswusergroup ugfiles cswcptemplates cswinitsmf 
+#SPKG_CLASSES_CSWmunin-common = none
+
+OBSOLETED_BY_CSWmunin-master = CSWmuninmaster
+SPKG_CATALOG_NAME_CSWmuninmaster = munin_master_stub
+
+OBSOLETED_BY_CSWmunin-node = CSWmuninnode
+SPKG_CATALOG_NAME_CSWmuninnode = munin_node_stub
+
+
+#
 # checkpkg overrides
 #
-# the following files contain "/usr/locail" and "/usr/share" - these strings appear in perldoc or as fallback path values
+# the following files contain "/usr/local" and "/usr/share" - these strings appear in perldoc or as fallback path values
 # so it's uncritical to leave them unpatched
 #
 
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/hddtemp_smartctl
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/lpstat
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/foldingathome
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/mhttping
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/ejabberd_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/smart_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/squeezebox_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/sybase_space
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/if_err_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/Munin::Node::Configure::PluginList.3perl
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/if_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/ps_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/squeezebox_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/smart_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/io_busy_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/io_bytes_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/nvidia_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/io_ops_
+CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/share/perl/site_perl/Munin/Node/Configure/PluginList.pm
+CHECKPKG_OVERRIDES_CSWmunin-master += file-with-bad-content|/usr/local|root/opt/csw/share/perl/site_perl/Munin/Master/HTMLOld.pm
 
 #
 # checkpkg overrides
@@ -68,17 +159,17 @@
 # yes, we need these dependencies
 #
 
-CHECKPKG_OVERRIDES_CSWmuninmaster += surplus-dependency|CSWmunincommon
-CHECKPKG_OVERRIDES_CSWmuninmaster += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWmuninmaster += surplus-dependency|CSWpmhtmltmpl
-CHECKPKG_OVERRIDES_CSWmuninmaster += surplus-dependency|CSWpmlog4perl
-CHECKPKG_OVERRIDES_CSWmuninmaster += surplus-dependency|CSWpm-rrdtool
-CHECKPKG_OVERRIDES_CSWmuninmaster += surplus-dependency|CSWpmprmsvldt
+CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWmunin-common
+CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpmhtmltmpl
+CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpmlog4perl
+CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpm-rrdtool
+CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpmprmsvldt
 
-CHECKPKG_OVERRIDES_CSWmuninnode += surplus-dependency|CSWmunincommon
-CHECKPKG_OVERRIDES_CSWmuninnode += surplus-dependency|CSWpmnetsnmp
-CHECKPKG_OVERRIDES_CSWmuninnode += surplus-dependency|CSWpmnetssleay
-CHECKPKG_OVERRIDES_CSWmuninnode += surplus-dependency|CSWpmnetserver
+CHECKPKG_OVERRIDES_CSWmunin-node += surplus-dependency|CSWmunin-common
+CHECKPKG_OVERRIDES_CSWmunin-node += surplus-dependency|CSWpmnetsnmp
+CHECKPKG_OVERRIDES_CSWmunin-node += surplus-dependency|CSWpmnetssleay
+CHECKPKG_OVERRIDES_CSWmunin-node += surplus-dependency|CSWpmnetserver
 
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -99,25 +190,26 @@
 	@#
 	@# we are using cswclassutils -> cswcptemplate
 	@#
-	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin
-	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin
-	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache
-	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www
-	@mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin/
-	@mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/
-	@ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin.conf
+	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmunin-node/etc/opt/csw/munin
+	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/etc/opt/csw/munin
+	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/etc/opt/csw/munin/apache
+	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/var/opt/csw/munin/www
+	@mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/opt/csw/etc/templates/CSWmunin-node/etc/opt/csw/munin/
+	@mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/etc/opt/csw/munin/
+	@ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW \
+		$(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/etc/opt/csw/munin/apache/apache-munin.conf
 	@ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf.CSW \
-		$(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin-cgi.conf
-	@mv $(DESTDIR)/var/opt/csw/munin/www/.htaccess $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www/
+		$(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/etc/opt/csw/munin/apache/apache-munin-cgi.conf
+	@mv $(DESTDIR)/var/opt/csw/munin/www/.htaccess $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/var/opt/csw/munin/www/
 	@#
-	@mv $(DESTDIR)/etc/opt/csw/munin/templates $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin
+	@mv $(DESTDIR)/etc/opt/csw/munin/templates $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/etc/opt/csw/munin
 	@#
 	@# create user munin during package deployment -> cswusergroup
 	@#
-	@ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster
-	@ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode
-	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster/cswusergroup
-	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode/cswusergroup
+	@ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmunin-master
+	@ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmunin-node
+	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmunin-master/cswusergroup
+	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmunin-node/cswusergroup
 	@#
 	@# create init script / smf -> cswinitsmf
 	@#
@@ -126,8 +218,8 @@
 	@#
 	@# create crontab for user munin -> cswcrontab
 	@#
-	@ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs
-	@ginstall -m 644 $(FILEDIR)/crontab.munin $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs/munin
+	@ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWmunin-master/crontabs
+	@ginstall -m 644 $(FILEDIR)/crontab.munin $(DESTDIR)/etc/opt/csw/pkg/CSWmunin-master/crontabs/munin
 	@#
 	@# print a postmessage -> cswpostmessage
 	@#
@@ -140,3 +232,10 @@
 	@ginstall -d $(DESTDIR)/opt/csw/share/munin/fonts
 	@ginstall -m 644 $(WORKSRC)/master/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf
 	@$(MAKECOOKIE)
+	@#
+	@# make some links for munin node
+	@#
+	@ln -s /opt/csw/libexec/munin/plugins/load $(DESTDIR)/etc/opt/csw/munin/plugins/load
+	@ln -s /opt/csw/libexec/munin/plugins/uptime $(DESTDIR)/etc/opt/csw/munin/plugins/uptime
+	@ln -s /opt/csw/libexec/munin/plugins/cpu $(DESTDIR)/etc/opt/csw/munin/plugins/cpu
+	@ln -s /opt/csw/libexec/munin/plugins/df $(DESTDIR)/etc/opt/csw/munin/plugins/df

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