Date: Fri, 7 Feb 2014 13:29:40 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343240 - in head/net-mgmt/nagios4: . files Message-ID: <201402071329.s17DTeAC029447@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Feb 7 13:29:40 2014 New Revision: 343240 URL: http://svnweb.freebsd.org/changeset/ports/343240 QAT: https://qat.redports.org/buildarchive/r343240/ Log: It seems nagios 4 can't build without the event broker, so remove the option and force it on. While there, replace a REINPLACE_CMD by a patch to get rid of a bsd.port.options.mk include. Reported by: demon, pkg-fallout Sponsored by: Absolight Added: head/net-mgmt/nagios4/files/extra-patch-html__side.php (contents, props changed) Modified: head/net-mgmt/nagios4/Makefile Modified: head/net-mgmt/nagios4/Makefile ============================================================================== --- head/net-mgmt/nagios4/Makefile Fri Feb 7 13:25:19 2014 (r343239) +++ head/net-mgmt/nagios4/Makefile Fri Feb 7 13:29:40 2014 (r343240) @@ -37,7 +37,8 @@ CONFIGURE_ARGS= --with-command-user=${NA --localstatedir=${NAGIOSDIR} \ --with-httpd-conf=${PREFIX}/etc \ --with-checkresult-dir=${NAGIOSDIR}/checkresults \ - --disable-statuswrl + --disable-statuswrl \ + --enable-event-broker CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ PERL=${PERL} @@ -70,23 +71,17 @@ NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin USERS= ${NAGIOSUSER} GROUPS= ${NAGIOSGROUP} -OPTIONS_DEFINE= NANOSLEEP EVENT_BROKER UNHANDLED_HACK +OPTIONS_DEFINE= NANOSLEEP UNHANDLED_HACK NANOSLEEP_DESC= Use nanosleep in event timing -EVENT_BROKER_DESC= Enable event broker functionality UNHANDLED_HACK_DESC= Display passive checks in unhandled queries OPTIONS_SUB= NANOSLEEP_CONFIGURE_ENABLE= nanosleep -EVENT_BROKER_CONFIGURE_ENABLE= event-broker -.include <bsd.port.options.mk> - -post-patch: -.if ${PORT_OPTIONS:MUNHANDLED_HACK} - @${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \ - -e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php -.endif +# sed -e 's#;serviceprops=42\&#;serviceprops=10\&#g' -e \ +# 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php +UNHANDLED_HACK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-html__side.php post-install: @${MV} ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php.sample Added: head/net-mgmt/nagios4/files/extra-patch-html__side.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/nagios4/files/extra-patch-html__side.php Fri Feb 7 13:29:40 2014 (r343240) @@ -0,0 +1,15 @@ +--- ./html/side.php.orig 2013-11-25 14:16:25.000000000 +0000 ++++ ./html/side.php 2014-02-07 13:14:41.000000000 +0000 +@@ -59,10 +59,10 @@ + <a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&servicestatustypes=28" target="<?php echo $link_target;?>">Problems</a> + <ul> + <li> +-<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&servicestatustypes=28" target="<?php echo $link_target;?>">Services</a> (<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&type=detail&hoststatustypes=3&serviceprops=42&servicestatustypes=28" target="<?php echo $link_target;?>">Unhandled</a>) ++<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&servicestatustypes=28" target="<?php echo $link_target;?>">Services</a> (<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&type=detail&hoststatustypes=3&serviceprops=10&servicestatustypes=28" target="<?php echo $link_target;?>">Unhandled</a>) + </li> + <li> +-<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12" target="<?php echo $link_target;?>">Hosts</a> (<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12&hostprops=42" target="<?php echo $link_target;?>">Unhandled</a>) ++<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12" target="<?php echo $link_target;?>">Hosts</a> (<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12&hostprops=10" target="<?php echo $link_target;?>">Unhandled</a>) + </li> + <li><a href="<?php echo $cfg["cgi_base_url"];?>/outages.cgi" target="<?php echo $link_target;?>">Network Outages</a></li> + </ul>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402071329.s17DTeAC029447>