From owner-svn-ports-head@FreeBSD.ORG Wed Jul 30 16:17:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DD1EAB8; Wed, 30 Jul 2014 16:17:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 50A36248B; Wed, 30 Jul 2014 16:17:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6UGHeJu002941; Wed, 30 Jul 2014 16:17:40 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6UGHdbU002933; Wed, 30 Jul 2014 16:17:39 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201407301617.s6UGHdbU002933@svn.freebsd.org> From: Lars Engels Date: Wed, 30 Jul 2014 16:17:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363492 - in head/net-mgmt: icinga icinga2 nagios nagios4 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.18 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: Wed, 30 Jul 2014 16:17:40 -0000 Author: lme Date: Wed Jul 30 16:17:39 2014 New Revision: 363492 URL: http://svnweb.freebsd.org/changeset/ports/363492 QAT: https://qat.redports.org/buildarchive/r363492/ Log: - Add OPTIONS to either depend on plugins from nagios-plugins.org, monitoring-plugins.org or neither at all - Bump PORTREVISION Approved by: mat (implicit) Modified: head/net-mgmt/icinga/Makefile head/net-mgmt/icinga2/Makefile head/net-mgmt/nagios/Makefile head/net-mgmt/nagios4/Makefile Modified: head/net-mgmt/icinga/Makefile ============================================================================== --- head/net-mgmt/icinga/Makefile Wed Jul 30 16:15:54 2014 (r363491) +++ head/net-mgmt/icinga/Makefile Wed Jul 30 16:17:39 2014 (r363492) @@ -3,6 +3,7 @@ PORTNAME= icinga PORTVERSION= 1.11.5 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/ @@ -12,7 +13,6 @@ COMMENT= Enterprise grade open source mo LICENSE= GPLv2 LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd -RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins USES= iconv gmake USE_AUTOTOOLS= autoconf libltdl @@ -74,10 +74,15 @@ SUB_LIST= PREFIX=${PREFIX} \ ${PLIST_SUB} OPTIONS_DEFINE= IDOUTILS -OPTIONS_DEFAULT= IDOUTILS +OPTIONS_RADIO= PLUGINS +OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS +OPTIONS_DEFAULT= IDOUTILS MONPLUGINS IDOUTILS_DESC= Enable Icinga Data Objects support +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 + .include .if ${PORT_OPTIONS:MIDOUTILS} Modified: head/net-mgmt/icinga2/Makefile ============================================================================== --- head/net-mgmt/icinga2/Makefile Wed Jul 30 16:15:54 2014 (r363491) +++ head/net-mgmt/icinga2/Makefile Wed Jul 30 16:17:39 2014 (r363492) @@ -2,6 +2,7 @@ PORTNAME= icinga2 DISTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://github.com/Icinga/${PORTNAME}/archive/v${DISTVERSION}.tar.gz?dummy=/ @@ -12,8 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo # for better debugging -RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins \ - ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash +RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash USES= bison cmake USE_LDCONFIG= yes @@ -21,10 +21,15 @@ USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS -OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= MYSQL PGSQL +OPTIONS_MULTI= BACKEND +OPTIONS_MULTI_BACKEND= MYSQL PGSQL +OPTIONS_RADIO= PLUGINS +OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS -OPTIONS_DEFAULT= MYSQL +OPTIONS_DEFAULT= MYSQL MONPLUGINS + +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 MYSQL_CMAKE_ON= -DWITH_MYSQL:BOOL=true PGSQL_CMAKE_ON= -DWITH_PGSQL:BOOL=true Modified: head/net-mgmt/nagios/Makefile ============================================================================== --- head/net-mgmt/nagios/Makefile Wed Jul 30 16:15:54 2014 (r363491) +++ head/net-mgmt/nagios/Makefile Wed Jul 30 16:17:39 2014 (r363492) @@ -3,7 +3,7 @@ PORTNAME= nagios PORTVERSION= 3.5.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION} @@ -13,7 +13,6 @@ COMMENT= Powerful network monitoring sys LICENSE= GPLv2 LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd -RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins PORTSCOUT= limit:^3. @@ -76,11 +75,17 @@ USERS= ${NAGIOSUSER} GROUPS= ${NAGIOSGROUP} OPTIONS_DEFINE= EMBEDDED_PERL NANOSLEEP EVENT_BROKER UNHANDLED_HACK +OPTIONS_RADIO= PLUGINS +OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS +OPTIONS_DEFAULT= NAGPLUGINS EMBEDDED_PERL_DESC= Enable embedded Perl [requires Perl 5.8.0+] NANOSLEEP_DESC= Use nanosleep in event timing EVENT_BROKER_DESC= Enable event broker functionality UNHANDLED_HACK_DESC= Display passive checks in unhandled queries +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 + OPTIONS_SUB= EMBEDDED_PERL_USE= perl5=run Modified: head/net-mgmt/nagios4/Makefile ============================================================================== --- head/net-mgmt/nagios4/Makefile Wed Jul 30 16:15:54 2014 (r363491) +++ head/net-mgmt/nagios4/Makefile Wed Jul 30 16:17:39 2014 (r363492) @@ -3,6 +3,7 @@ PORTNAME= nagios PORTVERSION= 4.0.7 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 4 @@ -72,9 +73,15 @@ USERS= ${NAGIOSUSER} GROUPS= ${NAGIOSGROUP} OPTIONS_DEFINE= NANOSLEEP UNHANDLED_HACK +OPTIONS_RADIO= PLUGINS +OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS +OPTIONS_DEFAULT= NAGPLUGINS NANOSLEEP_DESC= Use nanosleep in event timing UNHANDLED_HACK_DESC= Display passive checks in unhandled queries +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 + OPTIONS_SUB= NANOSLEEP_CONFIGURE_ENABLE= nanosleep