[csw-devel] SF.net SVN: gar:[3445] csw/mgar/pkg/nagiosp/trunk

[j_arndt at users.sourceforge.net]

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

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

Modified Paths:
--------------
    csw/mgar/pkg/nagiosp/trunk/Makefile
    csw/mgar/pkg/nagiosp/trunk/checksums
    csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.prototype

Modified: csw/mgar/pkg/nagiosp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagiosp/trunk/Makefile	2009-02-23 18:01:29 UTC (rev 3444)
+++ csw/mgar/pkg/nagiosp/trunk/Makefile	2009-02-23 18:02:33 UTC (rev 3445)
@@ -9,11 +9,11 @@
 
 MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/nagiosplug/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWnagiosp,prototype depend)
+DISTFILES += $(call admfiles,CSWnagiosp,prototype )
 
-PATCHFILES  = makefile.diff # add target 'none'
-PATCHFILES += plugins-root.diff # 
-PATCHFILES += legal.diff
+REQUIRED_PKGS_CSWnagiosp  = CSWggettextrt CSWiconv CSWlibnet CSWlibpq 
+REQUIRED_PKGS_CSWnagiosp += CSWmysql5rt CSWoldaprt CSWosslrt CSWsasl
+REQUIRED_PKGS_CSWnagiosp += CSWzlib
 
 CFLAGS += -I /opt/csw/postgresql/include/
 
@@ -31,9 +31,21 @@
 # Extra includes
 EXTRA_INC = /opt/csw/postgresql/include
 
-INSTALL_ARGS += install-contrib
-INSTALL_ARGS += install-legal
+TEST_TARGET = 
 
-TEST_TARGET = none
+include gar/category.mk
 
-include gar/category.mk
+DOCS = BUGS ChangeLog FAQ README REQUIREMENTS SUPPORT COPYING
+DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
+ROOT_PLUGINS = check_dhcp check_icmp pst3
+PLUGINDEST = $(DESTDIR)$(libexecdir)
+
+post-install-modulated:
+	@ginstall -m 755 -d $(DOCDEST)
+	@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
+	@ginstall -m 755 -d $(PLUGINDEST)
+	@$(foreach PLUGIN,$(ROOT_PLUGINS),ginstall -m 744 $(WORKSRC)/plugins-root/$(PLUGIN) $(PLUGINDEST);)
+	@tar cf $(WORKSRC)/contrib.tar $(WORKSRC)/contrib/
+	@ginstall -m 755 -d $(DOCDEST)
+	@ginstall -m 644 $(WORKSRC)/contrib.tar $(DOCDEST)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/nagiosp/trunk/checksums
===================================================================
--- csw/mgar/pkg/nagiosp/trunk/checksums	2009-02-23 18:01:29 UTC (rev 3444)
+++ csw/mgar/pkg/nagiosp/trunk/checksums	2009-02-23 18:02:33 UTC (rev 3445)
@@ -1,7 +1,3 @@
 be6cc7699fff3ee29d1fd4d562377386  download/nagios-plugins-1.4.13.tar.gz
 abfb8a44032960e6bc446a5ae5ebeafd  download/CSWnagiosp.gspec
-7edc85ec11ed146b6b1fc585c329a468  download/CSWnagiosp.prototype
-eadc14b27a73aa55d1d0accc0dd0eb00  download/CSWnagiosp.depend
-664323f0ea2e5abf7be2387ca22a13ba  download/makefile.diff
-3120b49a06d02676a4127fbe4d53f763  download/plugins-root.diff
-78d82c2ac3986566dd0edb5b3b66425f  download/legal.diff
+65bdf1c84228ccd98397837636004761  download/CSWnagiosp.prototype

Modified: csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.prototype
===================================================================
--- csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.prototype	2009-02-23 18:01:29 UTC (rev 3444)
+++ csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.prototype	2009-02-23 18:02:33 UTC (rev 3445)
@@ -1,5 +1,5 @@
 1 d none /opt/csw/lib 0755 root bin
-1 f none /opt/csw/lib/charset.alias 0644 root bin
+1 d none /opt/csw/share/doc/nagios-plugins 0755 root bin
 1 d none /opt/csw/libexec/nagios-plugins 0755 root bin
 1 f none /opt/csw/libexec/nagios-plugins/check_apt 0755 root bin
 1 f none /opt/csw/libexec/nagios-plugins/check_breeze 0755 root bin
@@ -67,6 +67,14 @@
 1 f none /opt/csw/libexec/nagios-plugins/urlize 0755 root bin
 1 f none /opt/csw/libexec/nagios-plugins/utils.pm 0755 root bin
 1 f none /opt/csw/libexec/nagios-plugins/utils.sh 0755 root bin
+1 f none /opt/csw/share/doc/nagios-plugins/BUGS 0644 root bin
+1 f none /opt/csw/share/doc/nagios-plugins/ChangeLog 0644 root bin
+1 f none /opt/csw/share/doc/nagios-plugins/FAQ 0644 root bin
+1 f none /opt/csw/share/doc/nagios-plugins/README 0644 root bin
+1 f none /opt/csw/share/doc/nagios-plugins/REQUIREMENTS 0644 root bin
+1 f none /opt/csw/share/doc/nagios-plugins/SUPPORT 0644 root bin
+1 f none /opt/csw/share/doc/nagios-plugins/COPYING 0644 root bin
+1 f none /opt/csw/share/doc/nagios-plugins/contrib.tar 0644 root bin
 1 d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin
 1 f none /opt/csw/share/locale/de/LC_MESSAGES/nagios-plugins.mo 0644 root bin
 1 d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin


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