[csw-devel] SF.net SVN: gar:[3564] csw/mgar/pkg/nsca/trunk

[j_arndt at users.sourceforge.net]

Revision: 3564
          http://gar.svn.sourceforge.net/gar/?rev=3564&view=rev
Author:   j_arndt
Date:     2009-03-03 12:13:45 +0000 (Tue, 03 Mar 2009)

Log Message:
-----------
nsca: added dynamic dependencies, removed patch for source Makefile, some cleanup

Modified Paths:
--------------
    csw/mgar/pkg/nsca/trunk/Makefile
    csw/mgar/pkg/nsca/trunk/checksums

Modified: csw/mgar/pkg/nsca/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nsca/trunk/Makefile	2009-03-02 22:36:22 UTC (rev 3563)
+++ csw/mgar/pkg/nsca/trunk/Makefile	2009-03-03 12:13:45 UTC (rev 3564)
@@ -9,30 +9,48 @@
 
 MASTER_SITES = http://mesh.dl.sourceforge.net/sourceforge/nagios/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWnsca, prototype checkinstall preinstall depend)
-DISTFILES += $(call admfiles,CSWsendnsca, preinstall depend)
+DISTFILES += $(call admfiles,CSWnsca, prototype checkinstall preinstall )
+DISTFILES += $(call admfiles,CSWsendnsca, preinstall )
 DISTFILES += nsca nsca.xml svc-nsca
 
 PATCHFILES += submit_check_results.diff
-PATCHFILES += makefile.diff
 
+REQUIRED_PKGS_CSWnsca     = CSWlibmcrypt CSWlibtoolrt CSWnagios
+REQUIRED_PKGS_CSWsendnsca = CSWlibmcrypt CSWlibtoolrt CSWnagios
+
 CONFIGURE_ARGS = $(DIRPATHS)
-#CONFIGURE_ARGS += --with-nsca-user=nagios
-#CONFIGURE_ARGS += --with-nsca-grp=nagios
 CONFIGURE_ARGS += --with-nsca-port=5667
 
 BUILD_TARGETS = nsca
 
 SKIPTEST = 1
 
-#INSTALL_ARGS = install-nsca
-INSTALL_ARGS += install-sendnsca
-INSTALL_ARGS += install-nsca
-
 include gar/category.mk
 
-pre-install-modulated:
+NAGIOSBINDIR=$(prefix)/nagios/bin
+NAGIOSCFGDIR=$(prefix)/nagios/etc
+NSCADOCDIR=$(prefix)/share/doc/nsca
+SENDNSCADOCDIR=$(prefix)/share/doc/send_nsca
+CFGDIR=$(prefix)/etc
+
+post-install-modulated:
 	ginstall -d $(DESTDIR)$(bindir)
 	ginstall -d $(DESTDIR)$(prefix)/nagios/bin
 	ginstall -d $(DESTDIR)$(prefix)/nagios/etc
-	$(MAKECOOKIE)
+	ginstall -m 755 -d $(DESTDIR)$(NSCADOCDIR)
+	ginstall -m 755 $(WORKSRC)/src/nsca $(DESTDIR)$(NAGIOSBINDIR)
+	ginstall -m 600 $(WORKSRC)/sample-config/nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/nsca.cfg
+	ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(NSCADOCDIR)
+	ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(NSCADOCDIR)
+	ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(NSCADOCDIR)
+	ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(NSCADOCDIR)
+	ginstall -m 755 $(WORKSRC)/src/send_nsca $(DESTDIR)$(BINDIR)
+	ginstall -m 755 -d $(DESTDIR)$(SENDNSCADOCDIR)
+	ginstall -m 755 -d $(DESTDIR)$(CFGDIR)
+	ginstall -m 755 $(WORKSRC)/src/submit_check_result-sample $(DESTDIR)$(SENDNSCADOCDIR)
+	ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(CFGDIR)/send_nsca.cfg
+	ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(SENDNSCADOCDIR)
+	ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(SENDNSCADOCDIR)
+	ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(SENDNSCADOCDIR)
+	ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(SENDNSCADOCDIR)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/nsca/trunk/checksums
===================================================================
--- csw/mgar/pkg/nsca/trunk/checksums	2009-03-02 22:36:22 UTC (rev 3563)
+++ csw/mgar/pkg/nsca/trunk/checksums	2009-03-03 12:13:45 UTC (rev 3564)
@@ -3,12 +3,9 @@
 9fa3302e1adfe6fb72e91b3cb0f5fdc3  download/CSWnsca.prototype
 1886b15eafd2e2a5a4b230918960ea9a  download/CSWnsca.checkinstall
 7fef893e65bb68bc0762434dbeace713  download/CSWnsca.preinstall
-4a31b1f69eb7caee94f3fffa1232e9f4  download/CSWnsca.depend
 b82767ed7ab002fea4b3a4395511c93c  download/CSWsendnsca.gspec
 8bf9882f3115e8514ae6d9a866397c71  download/CSWsendnsca.preinstall
-a590499dfa6f086d05cda4d86c2333cc  download/CSWsendnsca.depend
 58baa05824b28682cef9e678c3d0cefa  download/nsca
 b36f9006d3f725cc8d6cb9c01533a75c  download/nsca.xml
 58baa05824b28682cef9e678c3d0cefa  download/svc-nsca
 cbb38cacd3ca318f00dfa0877b6017df  download/submit_check_results.diff
-9e1686ea93030fb004d8c65f8c0a2e7d  download/makefile.diff


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