Thu Apr 16 09:32:36 2009 UTC ()
Pass --with-nagios-user and --with-nagios-group in CONFIGURE_ARGS, in
addition to the existing --with-nrpe-user and --with-nrpe-group.  We use
${NAGIOS_USER} and ${NAGIOS_GROUP} for both nagious user/group and nrpe
user/group.


(apb)
diff -r1.10 -r1.11 pkgsrc/net/nagios-nrpe/Makefile
cvs diff -r1.10 -r1.11 pkgsrc/net/nagios-nrpe/Makefile (expand / switch to unified diff)

--- pkgsrc/net/nagios-nrpe/Makefile 2008/06/21 14:52:48 1.10
+++ pkgsrc/net/nagios-nrpe/Makefile 2009/04/16 09:32:35 1.11
@@ -1,44 +1,47 @@ @@ -1,44 +1,47 @@
1# $NetBSD: Makefile,v 1.10 2008/06/21 14:52:48 tonnerre Exp $ 1# $NetBSD: Makefile,v 1.11 2009/04/16 09:32:35 apb Exp $
2# 2#
3 3
4DISTNAME= nrpe-2.12 4DISTNAME= nrpe-2.12
5PKGNAME= nagios-${DISTNAME} 5PKGNAME= nagios-${DISTNAME}
 6PKGREVISION= 1
6CATEGORIES= net sysutils 7CATEGORIES= net sysutils
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://sourceforge.net/projects/nagios/ 11HOMEPAGE= http://sourceforge.net/projects/nagios/
11COMMENT= Nagios remote program execution daemon 12COMMENT= Nagios remote program execution daemon
12 13
13.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_TOOLS+= perl 17USE_TOOLS+= perl
17USE_PKGINSTALL= yes 18USE_PKGINSTALL= yes
18 19
19PKG_SYSCONFSUBDIR= nagios 20PKG_SYSCONFSUBDIR= nagios
20CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nagios 21CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nagios
21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
22 23
23PKG_GROUPS+= ${NAGIOS_GROUP} 24PKG_GROUPS+= ${NAGIOS_GROUP}
24PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP} 25PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP}
25PKG_GECOS.${NAGIOS_USER}= Nagios Runtime User 26PKG_GECOS.${NAGIOS_USER}= Nagios Runtime User
26 27
27PKG_GROUPS_VARS+= NAGIOS_GROUP 28PKG_GROUPS_VARS+= NAGIOS_GROUP
28PKG_USERS_VARS+= NAGIOS_USER 29PKG_USERS_VARS+= NAGIOS_USER
29 30
30CONFIGURE_ARGS+= --with-nrpe-user=${NAGIOS_USER:Q} 31CONFIGURE_ARGS+= --with-nrpe-user=${NAGIOS_USER:Q}
31CONFIGURE_ARGS+= --with-nrpe-group=${NAGIOS_GROUP:Q} 32CONFIGURE_ARGS+= --with-nrpe-group=${NAGIOS_GROUP:Q}
 33CONFIGURE_ARGS+= --with-nagios-user=${NAGIOS_USER:Q}
 34CONFIGURE_ARGS+= --with-nagios-group=${NAGIOS_GROUP:Q}
32 35
33CONF_FILES+= ${PREFIX}/share/examples/nagios/nrpe.cfg ${PKG_SYSCONFDIR}/nrpe.cfg 36CONF_FILES+= ${PREFIX}/share/examples/nagios/nrpe.cfg ${PKG_SYSCONFDIR}/nrpe.cfg
34RCD_SCRIPTS+= nrpe 37RCD_SCRIPTS+= nrpe
35 38
36INSTALLATION_DIRS= sbin libexec/nagios share/examples/nagios share/examples/rc.d 39INSTALLATION_DIRS= sbin libexec/nagios share/examples/nagios share/examples/rc.d
37 40
38.include "options.mk" 41.include "options.mk"
39 42
40do-install: 43do-install:
41 ${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${PREFIX}/sbin 44 ${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${PREFIX}/sbin
42 ${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${PREFIX}/libexec/nagios 45 ${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${PREFIX}/libexec/nagios
43 ${INSTALL_DATA} ${WRKSRC}/sample-config/nrpe.cfg ${PREFIX}/share/examples/nagios 46 ${INSTALL_DATA} ${WRKSRC}/sample-config/nrpe.cfg ${PREFIX}/share/examples/nagios
44 ${INSTALL_SCRIPT} ${WRKDIR}/nrpe ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR} 47 ${INSTALL_SCRIPT} ${WRKDIR}/nrpe ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}