From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 7 01:10:27 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1FAA16A4CF for ; Sun, 7 Nov 2004 01:10:27 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 949B043D45 for ; Sun, 7 Nov 2004 01:10:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) iA71AQiN088854 for ; Sun, 7 Nov 2004 01:10:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id iA71AQJo088853; Sun, 7 Nov 2004 01:10:26 GMT (envelope-from gnats) Resent-Date: Sun, 7 Nov 2004 01:10:26 GMT Resent-Message-Id: <200411070110.iA71AQJo088853@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Edwin Groothuis Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4066716A4CE for ; Sun, 7 Nov 2004 01:00:52 +0000 (GMT) Received: from mailout2.barnet.com.au (mailout2.barnet.com.au [218.185.88.16]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2919343D48 for ; Sun, 7 Nov 2004 01:00:44 +0000 (GMT) (envelope-from edwin@mavetju.org) Received: by mailout2.barnet.com.au (Postfix, from userid 27) id 74AA1707439; Sun, 7 Nov 2004 12:00:42 +1100 (EST) Received: from mail2-auth.barnet.com.au (mailout2.barnet.com.au [218.185.88.16]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) Authority" (verified OK)) by mail2.barnet.com.au (Postfix) with ESMTP id 1E7BA707437; Sun, 7 Nov 2004 12:00:42 +1100 (EST) Received: from k7.mavetju (edwin-3.int.barnet.com.au [10.10.12.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) Certificate Authority" (verified OK)) by mail2-auth.barnet.com.au (Postfix) with ESMTP id 52DE1707432; Sun, 7 Nov 2004 12:00:41 +1100 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id 288EA60E5; Sun, 7 Nov 2004 12:00:40 +1100 (EST) Message-Id: <20041107010040.288EA60E5@k7.mavetju> Date: Sun, 7 Nov 2004 12:00:40 +1100 (EST) From: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: paul@nerdlabs.com Subject: ports/73632: [patch] support of rc_subr for net-mgmt/nrpe X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Edwin Groothuis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Nov 2004 01:10:28 -0000 >Number: 73632 >Category: ports >Synopsis: [patch] support of rc_subr for net-mgmt/nrpe >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 07 01:10:26 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 5.2.1-RELEASE i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #7: Tue Sep 21 23:13:39 EST 2004 root@k7.mavetju:/usr/src-5.2.1/sys/i386/compile/k7 i386 >Description: This patch will add rc_subr support for net-mgmt/nrpe >How-To-Repeat: >Fix: Two new files: files/nrpe.sh and pkg-message Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nrpe/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 30 May 2004 09:11:35 -0000 1.10 +++ Makefile 7 Nov 2004 00:55:58 -0000 @@ -7,7 +7,7 @@ PORTNAME= nrpe PORTVERSION= 1.9 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= nagios @@ -19,14 +19,28 @@ GNU_CONFIGURE= yes USE_PERL5= yes +USE_REINPLACE= yes +USE_RC_SUBR= yes +RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/nagios --sysconfdir=${PREFIX}/etc \ --sbindir=${PREFIX}/sbin --bindir=${PREFIX}/sbin +post-patch: + ${CP} ${FILESDIR}/nrpe.sh ${WRKDIR}/nrpe.sh + ${REINPLACE_CMD} \ + -e 's,%%PREFIX%%,${PREFIX},g' \ + -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ + ${WRKDIR}/nrpe.sh + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${PREFIX}/sbin/nrpe - ${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${PREFIX}/libexec/nagios/check_nrpe + ${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe \ + ${PREFIX}/libexec/nagios/check_nrpe ${INSTALL_DATA} ${WRKSRC}/nrpe.cfg ${PREFIX}/etc/nrpe.cfg-sample - ${INSTALL_SCRIPT} ${WRKSRC}/init-script.freebsd ${PREFIX}/etc/rc.d/nrpe.sh + ${INSTALL_SCRIPT} ${WRKDIR}/nrpe.sh ${PREFIX}/etc/rc.d/nrpe.sh + +post-install: + ${CAT} ${PKGMESSAGE} .include Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-message 7 Nov 2004 00:55:58 -0000 @@ -0,0 +1,5 @@ +************************************************************************* +Available variables you add/set to /etc/rc.conf: +- nrpe_enable (bool): Set to "NO" by default +- nrpe_config (string): Set to ${PREFIX}/etc/nrpe.cfg by default +************************************************************************* Index: files/nrpe.sh =================================================================== RCS file: files/nrpe.sh diff -N files/nrpe.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/nrpe.sh 7 Nov 2004 00:55:58 -0000 @@ -0,0 +1,27 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# +# Add the following lines to /etc/rc.conf to enable apache2: +# nrpe_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable nrpe +# nrpe_config (string): Set to "/usr/local/etc/nrpe.cfg" by default. +# + +. %%RC_SUBR%% + +name="nrpe" +rcvar=`set_rcvar` + +command="%%PREFIX%%/bin/nrpe" + +[ -z "$nrpe_enable" ] && nrpe_enable="NO" +[ -z "$nrpe_config" ] && nrpe_config="%%PREFIX%%/etc/nrpe.cfg" + +nrpe_flags="-d ${nrpe_config}" + +load_rc_config $name + +run_rc_command "$1" >Release-Note: >Audit-Trail: >Unformatted: