From 3ae9a07d945cafe209cc58d336f4e225a2645016 Mon Sep 17 00:00:00 2001 From: gdt Date: Tue, 22 Feb 2011 15:23:43 +0000 Subject: Don't pass --disable-command-args to configure. See options.mk, in the case without options nagios-nrpe-args: # Upstream's configure enables command args when given # "--disable-command-args", so (departing from pkgsrc norms) don't # give the --disable option. PKGREVISION++; the previous version enabled command args when it should not have. --- net/nagios-nrpe/Makefile | 4 ++-- net/nagios-nrpe/options.mk | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'net') diff --git a/net/nagios-nrpe/Makefile b/net/nagios-nrpe/Makefile index 52662984bc6..2f413d77b9e 100644 --- a/net/nagios-nrpe/Makefile +++ b/net/nagios-nrpe/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2010/09/29 10:52:25 obache Exp $ +# $NetBSD: Makefile,v 1.15 2011/02/22 15:23:43 gdt Exp $ # DISTNAME= nrpe-2.12 PKGNAME= nagios-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} diff --git a/net/nagios-nrpe/options.mk b/net/nagios-nrpe/options.mk index a9940e22c63..9d8be259ad8 100644 --- a/net/nagios-nrpe/options.mk +++ b/net/nagios-nrpe/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2011/02/22 15:09:07 gdt Exp $ +# $NetBSD: options.mk,v 1.5 2011/02/22 15:23:43 gdt Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nagios-nrpe PKG_SUPPORTED_OPTIONS= ssl tcpwrappers nagios-nrpe-args @@ -19,7 +19,10 @@ CONFIGURE_ARGS+= --disable-ssl .if !empty(PKG_OPTIONS:Mnagios-nrpe-args) CONFIGURE_ARGS+= --enable-command-args .else -CONFIGURE_ARGS+= --disable-command-args +# Upstream's configure enables command args when given +# "--disable-command-args", so (departing from pkgsrc norms) don't +# give the --disable option. +#CONFIGURE_ARGS+= --disable-command-args .endif .if !empty(PKG_OPTIONS:Mtcpwrappers) -- cgit v1.2.3