Mon Jun 9 12:36:15 2008 UTC ()
In rc.d script, mkdir and chown /var/run/nagios so that nagios can
write the pid file.  PKGREVISION++.

OK tonnerre@.


(gdt)
diff -r1.17 -r1.18 pkgsrc/net/nagios-base/Makefile
diff -r1.4 -r1.5 pkgsrc/net/nagios-base/files/nagios.sh
cvs diff -r1.17 -r1.18 pkgsrc/net/nagios-base/Makefile (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/Makefile 2008/03/18 21:53:41 1.17
+++ pkgsrc/net/nagios-base/Makefile 2008/06/09 12:36:15 1.18
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.17 2008/03/18 21:53:41 tonnerre Exp $ 1# $NetBSD: Makefile,v 1.18 2008/06/09 12:36:15 gdt Exp $
2# 2#
3 3
4DISTNAME= nagios-2.5 4DISTNAME= nagios-2.5
5PKGNAME= ${DISTNAME:S/-/-base-/} 5PKGNAME= ${DISTNAME:S/-/-base-/}
6PKGREVISION= 5 6PKGREVISION= 6
7CATEGORIES= net sysutils 7CATEGORIES= net sysutils
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
9 9
10MAINTAINER= tonnerre@NetBSD.org 10MAINTAINER= tonnerre@NetBSD.org
11HOMEPAGE= http://www.nagios.org/ 11HOMEPAGE= http://www.nagios.org/
12COMMENT= Network monitor 12COMMENT= Network monitor
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
15.include "../../net/nagios-base/Makefile.common" 15.include "../../net/nagios-base/Makefile.common"
16.include "options.mk" 16.include "options.mk"
17 17
18CONFIGURE_ARGS+= --with-gd-lib=${LOCALBASE}/lib 18CONFIGURE_ARGS+= --with-gd-lib=${LOCALBASE}/lib
19CONFIGURE_ARGS+= --with-gd-inc=${LOCALBASE}/include 19CONFIGURE_ARGS+= --with-gd-inc=${LOCALBASE}/include
cvs diff -r1.4 -r1.5 pkgsrc/net/nagios-base/files/nagios.sh (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/files/nagios.sh 2007/11/26 22:14:14 1.4
+++ pkgsrc/net/nagios-base/files/nagios.sh 2008/06/09 12:36:15 1.5
@@ -1,27 +1,35 @@ @@ -1,27 +1,35 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: nagios.sh,v 1.4 2007/11/26 22:14:14 seb Exp $ 3# $NetBSD: nagios.sh,v 1.5 2008/06/09 12:36:15 gdt Exp $
4# 4#
5# PROVIDE: nagios 5# PROVIDE: nagios
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7 7
8. /etc/rc.subr 8. /etc/rc.subr
9 9
10name="nagios" 10name="nagios"
11rcvar=$name 11rcvar=$name
12command="@PREFIX@/bin/${name}" 12command="@PREFIX@/bin/${name}"
13pidfile="/var/run/${name}.lock" 13piddir="/var/run/${name}"
 14pidfile="${piddir}/${name}.lock"
14config="@PKG_SYSCONFDIR@/${name}.cfg" 15config="@PKG_SYSCONFDIR@/${name}.cfg"
15 16
16command_args="-d $config" 17command_args="-d $config"
17  18
 19start_precmd="nagios_precmd"
18test_cmd="nagios_test" 20test_cmd="nagios_test"
19extra_commands="test reload" 21extra_commands="test reload"
20 22
 23nagios_precmd()
 24{
 25 mkdir -p ${piddir}
 26 chown nagios ${piddir}
 27}
 28
21nagios_test() 29nagios_test()
22{ 30{
23 $command -v $config 31 $command -v $config
24} 32}
25 33
26load_rc_config $name 34load_rc_config $name
27run_rc_command "$1" 35run_rc_command "$1"