[37729] trunk/dports/net/nagios/Portfile

[markd at macports.org]

Revision: 37729
          http://trac.macosforge.org/projects/macports/changeset/37729
Author:   markd at macports.org
Date:     2008-06-20 22:18:49 -0700 (Fri, 20 Jun 2008)
Log Message:
-----------
Update to 3.0.2.

Modified Paths:
--------------
    trunk/dports/net/nagios/Portfile

Modified: trunk/dports/net/nagios/Portfile
===================================================================
--- trunk/dports/net/nagios/Portfile	2008-06-21 01:14:18 UTC (rev 37728)
+++ trunk/dports/net/nagios/Portfile	2008-06-21 05:18:49 UTC (rev 37729)
@@ -3,7 +3,7 @@
 PortSystem	1.0
 
 name			nagios
-version			2.10
+version			3.0.2
 
 categories		net
 maintainers		markd
@@ -20,7 +20,7 @@
 homepage		http://nagios.org
 
 master_sites		sourceforge
-checksums		md5 8c3a29e138f2ff8c8abbd3dd8a40c4b6
+checksums		md5 008d71aac08660bc007f7130ea82ab80
 
 depends_build		port:gd2
 depends_lib             port:openssl \
@@ -44,13 +44,19 @@
 			--with-lockfile=${prefix}/var/nagios/nagios.lock \
 			--with-init-dir=${prefix}/var/nagios \
 			--sysconfdir=${sysconfdir} \
-			--localstatedir=${prefix}/var/nagios
+			--localstatedir=${prefix}/var/nagios \
+			--with-httpd-conf=/etc/apache2/httpd.conf
 
 variant monarch {
 # This variant installs the Monarch configuration GUI for Nagios
 		depends_lib-append      port:monarch
 }
 
+platform darwin 8 {
+	configure.args-delete --with-httpd-conf=/etc/apache2/httpd.conf
+	configure.args-append --with-httpd-conf=/etc/httpd/httpd.conf
+}
+
 startupitem.create      yes
 startupitem.start       "${prefix}/var/nagios/nagios.init start"
 startupitem.stop        "${prefix}/var/nagios/nagios.init stop"
@@ -65,6 +71,9 @@
 	reinplace "s|check_external_commands=0|check_external_commands=1|g" \
                 "${worksrcpath}/sample-config/nagios.cfg.in"
 
+        reinplace "s|/bin/mail|/usr/bin/mail|g" \
+		"${worksrcpath}/sample-config/template-object/commands.cfg.in"
+
 	reinplace "s|NagiosLockDir=/var/lock/subsys|NagiosLockDir=${prefix}/var/nagios|g" \
 		${worksrcpath}/daemon-init.in
 	reinplace "s|su -|su -m|g" \
@@ -77,10 +86,6 @@
 }
 
 post-destroot {
-# Point the commands.cfg to the correct location for Apple's mail executable
-	reinplace "s|/bin/mail|/usr/bin/mail|g" \
-		"${destroot}${sysconfdir}/commands.cfg"
-
 # Keep the empty command file directory created by 'make install-commandmode'
         destroot.keepdirs ${destroot}${prefix}/var/nagios/rw
 
@@ -88,6 +93,9 @@
 	foreach cfgfile [glob ${destroot}${sysconfdir}/*.cfg] {
 		file rename ${cfgfile} ${cfgfile}-sample
 	}
+	foreach cfgfile [glob ${destroot}${sysconfdir}/objects/*.cfg] {
+		file rename ${cfgfile} ${cfgfile}-sample
+	}
 }
 
 post-activate {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080620/1285a86c/attachment.htm