[csw-devel] SF.net SVN: gar:[3565] csw/mgar/pkg/nrpe/trunk

[j_arndt at users.sourceforge.net]

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

Log Message:
-----------
nrpe: added dynamic dependencies and custom install script,  removed patches for source Makefile, some cleanup

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

Modified: csw/mgar/pkg/nrpe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nrpe/trunk/Makefile	2009-03-03 12:13:45 UTC (rev 3564)
+++ csw/mgar/pkg/nrpe/trunk/Makefile	2009-03-03 12:40:35 UTC (rev 3565)
@@ -7,13 +7,15 @@
   NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well.
 endef
 
-#MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/nagios/
-MASTER_SITES = $(SF_MASTERS)
+MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWnrpe, prototype checkinstall preinstall postinstall preremove depend)
+DISTFILES += $(call admfiles,CSWnrpe, prototype checkinstall preinstall postinstall preremove )
 DISTFILES += svc-nrpe nrpe.xml nrpe
-DISTFILES += $(call admfiles,CSWnrpeplugin, prototype depend)
+DISTFILES += $(call admfiles,CSWnrpeplugin, prototype )
 
+REQUIRED_PKGS_CSWnrpe       = CSWosslrt CSWtcpwrap
+REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl-lib=/opt/csw/lib
 CONFIGURE_ARGS += --with-ssl-inc=/opt/csw/include
@@ -21,26 +23,37 @@
 CONFIGURE_ARGS += --with-kerberos-inc=/opt/csw/include
 CONFIGURE_ARGS += --prefix=/opt/csw/nagios
 CONFIGURE_ARGS += --exec-prefix=/opt/csw/nagios
-CONFIGURE_ARGS += --with-command-user=nagios
-CONFIGURE_ARGS += --with-command-group=nagios
 
 PATCHFILES = patch.diff	# Removal of LOG_AUTHPRIV and LOG_FTP
 			# Solaris doesn't have these log facilities
 PATCHFILES += configure.diff 
-PATCHFILES += makefile.diff
-PATCHFILES += doc.diff	# changes made to global Makefile.in to copy some docs
 
-sysconfdir ?= $(prefix)/nagios/etc
-bindir ?= $(prefix)/bin
-libexecdir ?= $(prefix)/libexec/nagios-plugins
-datadir ?= $(prefix)/share
+sysconfdir = $(prefix)/nagios/etc
+bindir = $(prefix)/bin
+libexecdir = $(prefix)/libexec/nagios-plugins
+datadir = $(prefix)/share
 
+TEST_TARGET = all
+INSTALL_SCRIPTS = custom
 
-#EXTRA_LIB = /opt/csw/lib
+include gar/category.mk
 
-TEST_TARGET = all
+DOCDIR=$(datadir)/doc/nrpe
+CFGDIR=$(sysconfdir)
+LIBEXECDIR=$(libexecdir)
+BINDIR=$(bindir)
 
-INSTALL_ARGS += install-docs
-INSTALL_ARGS += install-daemon-config
-
-include gar/category.mk
+install-custom:
+	ginstall -m 775 -d $(DESTDIR)$(DOCDIR)
+	ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR)
+	ginstall -m 755 -d $(DESTDIR)$(BINDIR)
+	ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR)
+	ginstall -m 755 $(WORKSRC)/src/nrpe $(DESTDIR)$(BINDIR)
+	ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR)
+	ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(DOCDIR)
+	ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(DOCDIR)
+	ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR)
+	ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR)
+	ginstall -m 775 -d $(DESTDIR)$(CFGDIR)
+	ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/nrpe/trunk/checksums
===================================================================
--- csw/mgar/pkg/nrpe/trunk/checksums	2009-03-03 12:13:45 UTC (rev 3564)
+++ csw/mgar/pkg/nrpe/trunk/checksums	2009-03-03 12:40:35 UTC (rev 3565)
@@ -5,14 +5,10 @@
 53eea7ed36535bb6cbe1d6fe0aae3508  download/CSWnrpe.preinstall
 71c9056ac6d0010a748745a405385d55  download/CSWnrpe.postinstall
 393872a95d2b9ec90363664c31074415  download/CSWnrpe.preremove
-c585258595292cc43525385c87e1d126  download/CSWnrpe.depend
 ec1857a4400022e3eec874c34e2b7232  download/svc-nrpe
 1ee84a3e24cd4237bbb1fae59fc1d4ca  download/nrpe.xml
 ec1857a4400022e3eec874c34e2b7232  download/nrpe
 54aebe8f3d7bc8d2ec5ea1954d859b10  download/CSWnrpeplugin.gspec
 e22a7817c7665e79bcbad7e091375be9  download/CSWnrpeplugin.prototype
-a3658628a24ac990a0e3b552a9fcb8db  download/CSWnrpeplugin.depend
 5b02d4385daaea2a8c13903539aa6189  download/patch.diff
 4b51476c782d2c5764d10f8ed530ada0  download/configure.diff
-90d1e4acfa3f031b20fc7e229387d0e6  download/makefile.diff
-34edc5baa80d11bae0ddd754e2e72b23  download/doc.diff


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