From owner-svn-ports-head@freebsd.org Thu Feb 4 20:18:03 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84DC0A9CCA9; Thu, 4 Feb 2016 20:18:03 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5862A378; Thu, 4 Feb 2016 20:18:03 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14KI283008517; Thu, 4 Feb 2016 20:18:02 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14KI2Ux008516; Thu, 4 Feb 2016 20:18:02 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201602042018.u14KI2Ux008516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Thu, 4 Feb 2016 20:18:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408091 - head/net-mgmt/nrpe X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2016 20:18:03 -0000 Author: zeising Date: Thu Feb 4 20:18:02 2016 New Revision: 408091 URL: https://svnweb.freebsd.org/changeset/ports/408091 Log: Make it possible to depend on either net-mgmt/nagios-plugins or net-mgmt/monitoring-plugins. PR: 196325 Submitted by: Niels Kristensen Modified: head/net-mgmt/nrpe/Makefile Modified: head/net-mgmt/nrpe/Makefile ============================================================================== --- head/net-mgmt/nrpe/Makefile Thu Feb 4 20:05:11 2016 (r408090) +++ head/net-mgmt/nrpe/Makefile Thu Feb 4 20:18:02 2016 (r408091) @@ -3,15 +3,13 @@ PORTNAME= nrpe DISTVERSION= 2.15 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MASTER_SITES= SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION} MAINTAINER= zeising@FreeBSD.org COMMENT?= Nagios Remote Plugin Executor -RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins - CONFLICTS= nrpe-ssl-2.* USES= perl5 @@ -20,10 +18,14 @@ USE_RC_SUBR= nrpe2 GNU_CONFIGURE= yes OPTIONS_DEFINE= SSL ARGS -OPTIONS_DEFAULT=ARGS +OPTIONS_RADIO= PLUGINS +OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS +OPTIONS_DEFAULT=ARGS NAGPLUGINS SSL_DESC= Enable SSL support (disables plain-text server) ARGS_DESC= Enable command argument processing +NAGPLUGINS_DESC=Use net-mgmt/nagios-plugins +MONPLUGINS_DESC=Use net-mgmt/monitoring-plugins SSL_USE= OPENSSL=yes SSL_CONFIGURE_ON= --enable-ssl --with-ssl=${OPENSSLDIR} \ @@ -35,6 +37,9 @@ SSL_CFLAGS= -I${OPENSSLINC} ARGS_CONFIGURE_ON= --enable-command-args ARGS_CONFIGURE_OFF= --disable-command-args +MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins +NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins + NAGIOSUSER?= nagios NAGIOSGROUP?= nagios USERS= ${NAGIOSUSER}