[csw-devel] SF.net SVN: gar:[3698] csw/mgar/pkg/nagios/trunk

[j_arndt at users.sourceforge.net]

Revision: 3698
          http://gar.svn.sourceforge.net/gar/?rev=3698&view=rev
Author:   j_arndt
Date:     2009-03-10 20:08:58 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
nagios: fixed dependencies, switched to SMF via cswclassutils

Modified Paths:
--------------
    csw/mgar/pkg/nagios/trunk/Makefile
    csw/mgar/pkg/nagios/trunk/checksums
    csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec
    csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype

Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile	2009-03-10 17:59:16 UTC (rev 3697)
+++ csw/mgar/pkg/nagios/trunk/Makefile	2009-03-10 20:08:58 UTC (rev 3698)
@@ -9,8 +9,8 @@
 
 MASTER_SITES =$(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWnagios,checkinstall preinstall preremove prototype postinstall )
-DISTFILES += nagios nagios.xml svc-nagios
+DISTFILES += $(call admfiles,CSWnagios,checkinstall preinstall preremove prototype )
+DISTFILES += cswnagios
 
 PATCHFILES = patch.diff	# cgi/cmd.c - GNU macro __attribute__ unknown to compiler
 			# http://article.gmane.org/gmane.network.nagios.devel/4726
@@ -22,8 +22,12 @@
 				# necessary, so ginstall doesn't get -o and -g options
 
 REQUIRED_PKGS_CSWnagios  = CSWapache CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt
-REQUIRED_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWnrpeplugin
+REQUIRED_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWnrpeplugin CSWcswclassutils
 
+SPKG_CLASSES = none cswinitsmf
+
+PROTOTYPE_FILTER  = awk '$$$$3 ~ /\/init.d\/cswnagios$$$$/ { $$$$2 = "cswinitsmf" } { print }'
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --prefix=/opt/csw/nagios
 CONFIGURE_ARGS += --exec-prefix=/opt/csw/nagios
@@ -61,5 +65,7 @@
 	@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
 	@ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST)
 	@ginstall -m 644 $(WORKSRC)/sample-config/httpd.conf $(HTTPD_CONF)/httpd-nagios.conf
+	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+	@ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/opt/csw/init.d/cswnagios
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/nagios/trunk/checksums
===================================================================
--- csw/mgar/pkg/nagios/trunk/checksums	2009-03-10 17:59:16 UTC (rev 3697)
+++ csw/mgar/pkg/nagios/trunk/checksums	2009-03-10 20:08:58 UTC (rev 3698)
@@ -1,13 +1,10 @@
 900e3f4164f4b2a18485420eeaefe812  download/nagios-3.0.6.tar.gz
-843f2deb49d5a283d9ed88974d18d49a  download/CSWnagios.gspec
+725a49b8ec806a8d0c817fe4c1208b3c  download/CSWnagios.gspec
 e407a4b179bd7de72b3e8c21f309f9b7  download/CSWnagios.checkinstall
 47cc36016f5518dfd5614b870f56e944  download/CSWnagios.preinstall
 92437323de0cceaa58c6238ec9e6c954  download/CSWnagios.preremove
-080b1c99e3b72d6767ec5ab4461b7fe1  download/CSWnagios.prototype
-2ed96c2fb28a30112681b772465bf2a6  download/CSWnagios.postinstall
-eee3268b11eb94d797f0f606d53cfb97  download/nagios
-2bca004216ac8d8774e8bf3f974eca10  download/nagios.xml
-66adfde9e041150b29e31ea8f8c0b604  download/svc-nagios
+92467193beb7d39c7a56a520731cfb5c  download/CSWnagios.prototype
+eee3268b11eb94d797f0f606d53cfb97  download/cswnagios
 0ef601e30d01a511822dd27df6b0e531  download/patch.diff
 4faa5ec86586be23dfbbd9165f50046d  download/configure.diff
 f3161bcb7c65f89707ee37b0a8d861d5  download/install-opts.diff

Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec	2009-03-10 17:59:16 UTC (rev 3697)
+++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec	2009-03-10 20:08:58 UTC (rev 3698)
@@ -1,8 +1,3 @@
 %var            bitname nagios
 %var            pkgname CSWnagios
-%var      	SERVICE_CONF_FILES      /opt/csw/nagios/etc/nagios.cfg
-%var            RC_INIT_SCRIPT          nagios
-%var            SMF_SCRIPT              svc-nagios
-%var            SMF_MANIFEST            nagios.xml
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%include        url file://%{PKGLIB}/smf_enabled.gspec

Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype	2009-03-10 17:59:16 UTC (rev 3697)
+++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype	2009-03-10 20:08:58 UTC (rev 3698)
@@ -385,9 +385,9 @@
 f none /opt/csw/share/doc/nagios/README 0644 root bin
 f none /opt/csw/share/doc/nagios/UPGRADING 0644 root bin
 f none /opt/csw/share/doc/nagios/LICENSE 0644 root bin
+f cswinitsmf /etc/opt/csw/init.d/cswnagios 0755 root bin
 i checkinstall=CSWnagios.checkinstall
 i preinstall=CSWnagios.preinstall
 i depend=CSWnagios.depend
 i pkginfo=CSWnagios.pkginfo
-i postinstall=CSWnagios.postinstall
 i preremove=CSWnagios.preremove


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.