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

Mon Feb 23 19:01:30 CET 2009

Revision: 3444
          http://gar.svn.sourceforge.net/gar/?rev=3444&view=rev
Author:   j_arndt
Date:     2009-02-23 18:01:29 +0000 (Mon, 23 Feb 2009)

Log Message:
-----------
nagios: added pre-install-modulated directives and dynamic dependencies to Makefile

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-02-23 17:47:39 UTC (rev 3443)
+++ csw/mgar/pkg/nagios/trunk/Makefile	2009-02-23 18:01:29 UTC (rev 3444)
@@ -7,10 +7,9 @@
   Nagios is a powerful, enterprise-class host, service, application, and network monitoring program. Designed to be fast, flexible, and rock-solid stable. Nagios runs on *NIX hosts and can monitor Windows, Linux/Unix/BSD, Netware, and network devices.
 endef
 
-MASTER_SITES = http://kent.dl.sourceforge.net/sourceforge/nagios/
+MASTER_SITES =$(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-#DISTFILES += $(call admfiles,CSWnagios)
-DISTFILES += $(call admfiles,CSWnagios,prototype checkinstall preinstall preremove postinstall depend)
+DISTFILES += $(call admfiles,CSWnagios,checkinstall preinstall preremove prototype postinstall )
 DISTFILES += nagios nagios.xml svc-nagios
 
 PATCHFILES = patch.diff	# cgi/cmd.c - GNU macro __attribute__ unknown to compiler
@@ -21,10 +20,10 @@
 				# -lsunmath is needed in configure for checking of libgd
 PATCHFILES += install-opts.diff	# sets in every Makefile.in "INSTALL_OPT="" (empty)
 				# necessary, so ginstall doesn't get -o and -g options
-PATCHFILES += webconf.diff	# global Makefile.in
-				# nagios httpd-config is renamed to httpd-nagios.conf
-PATCHFILES += doc.diff	# Makefile.in - copies READMes ... to /opt/csw/share/doc/nagios/
 
+REQUIRED_PKGS_CSWnagios  = CSWapache CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt
+REQUIRED_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWnrpeplugin
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --prefix=/opt/csw/nagios
 CONFIGURE_ARGS += --exec-prefix=/opt/csw/nagios
@@ -33,7 +32,6 @@
 CONFIGURE_ARGS += --with-httpd-conf=/opt/csw/nagios/etc
 CONFIGURE_ARGS += --enable-embedded-perl
 
-#prefix ?= /opt/csw/nagios
 sysconfdir ?= $(prefix)/nagios/etc
 localstatedir ?= $(prefix)/nagios/var
 bindir ?= $(prefix)/nagios/bin
@@ -49,7 +47,19 @@
 
 INSTALL_ARGS += install-init
 INSTALL_ARGS += install-config
-INSTALL_ARGS += install-webconf
 INSTALL_ARGS += install-commandmode
-INSTALL_ARGS += install-docs
+
 include gar/category.mk
+
+DOCS = Changelog INSTALLING README UPGRADING
+DOCDEST = $(DESTDIR)$(prefix)/share/doc/nagios
+HTTPD_CONF = $(DESTDIR)$(sysconfdir)
+
+post-install-modulated:
+	@echo $(DOCDEST)
+	@ginstall -m 755 -d  $(DOCDEST)
+	@$(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
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/nagios/trunk/checksums
===================================================================
--- csw/mgar/pkg/nagios/trunk/checksums	2009-02-23 17:47:39 UTC (rev 3443)
+++ csw/mgar/pkg/nagios/trunk/checksums	2009-02-23 18:01:29 UTC (rev 3444)
@@ -1,16 +1,13 @@
 900e3f4164f4b2a18485420eeaefe812  download/nagios-3.0.6.tar.gz
-799f1b92197d0d0fabfc09631abab3f9  download/CSWnagios.gspec
-4a34971d496bff77fc2bfd0eb2007c37  download/CSWnagios.prototype
+843f2deb49d5a283d9ed88974d18d49a  download/CSWnagios.gspec
 e407a4b179bd7de72b3e8c21f309f9b7  download/CSWnagios.checkinstall
 47cc36016f5518dfd5614b870f56e944  download/CSWnagios.preinstall
 92437323de0cceaa58c6238ec9e6c954  download/CSWnagios.preremove
+080b1c99e3b72d6767ec5ab4461b7fe1  download/CSWnagios.prototype
 2ed96c2fb28a30112681b772465bf2a6  download/CSWnagios.postinstall
-95cce43182ddef277c1556c1607e3bb5  download/CSWnagios.depend
 eee3268b11eb94d797f0f606d53cfb97  download/nagios
 2bca004216ac8d8774e8bf3f974eca10  download/nagios.xml
 66adfde9e041150b29e31ea8f8c0b604  download/svc-nagios
 0ef601e30d01a511822dd27df6b0e531  download/patch.diff
 4faa5ec86586be23dfbbd9165f50046d  download/configure.diff
 f3161bcb7c65f89707ee37b0a8d861d5  download/install-opts.diff
-f1c09f43c8994b97608a9f57cef28191  download/webconf.diff
-d4b9518af39194e571fcb894b3aac6d2  download/doc.diff

Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec	2009-02-23 17:47:39 UTC (rev 3443)
+++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec	2009-02-23 18:01:29 UTC (rev 3444)
@@ -1,9 +1,8 @@
 %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
+%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
-%copyright      url file://%{WORKSRC}/LICENSE
+%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-02-23 17:47:39 UTC (rev 3443)
+++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype	2009-02-23 18:01:29 UTC (rev 3444)
@@ -384,9 +384,9 @@
 f none /opt/csw/share/doc/nagios/INSTALLING 0644 root bin
 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
 i checkinstall=CSWnagios.checkinstall
 i preinstall=CSWnagios.preinstall
-i copyright=CSWnagios.copyright
 i depend=CSWnagios.depend
 i pkginfo=CSWnagios.pkginfo
 i postinstall=CSWnagios.postinstall


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

