Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Apr 2019 08:34:48 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r499002 - head/net-mgmt/mk-livestatus
Message-ID:  <201904150834.x3F8YmVa088230@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Mon Apr 15 08:34:48 2019
New Revision: 499002
URL: https://svnweb.freebsd.org/changeset/ports/499002

Log:
  net-mgmt/mk-livestatus: Restore fix from r485075
  
  mk-livestatus always builds with Nagios 4 support again and
  --without-nagios4 is still broken.
  
  PR:		232716
  Reported by:	Leonid Vasiliev <leo9641@yandex.ru>
  Approved by:	egypcio (maintainer)

Modified:
  head/net-mgmt/mk-livestatus/Makefile

Modified: head/net-mgmt/mk-livestatus/Makefile
==============================================================================
--- head/net-mgmt/mk-livestatus/Makefile	Mon Apr 15 08:31:41 2019	(r499001)
+++ head/net-mgmt/mk-livestatus/Makefile	Mon Apr 15 08:34:48 2019	(r499002)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mk-livestatus
 PORTVERSION=	1.2.8p25
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://mathias-kettner.de/download/
 DIST_SUBDIR=	check_mk
@@ -39,7 +40,10 @@ PERL_DESC=	Install Monitoring-Livestatus Perl API
 
 EXAMPLES_USES=	python
 NAGIOS3_RUN_DEPENDS=	nagios>=3.5.1:net-mgmt/nagios
-NAGIOS4_CONFIGURE_WITH=	nagios4
+# --without-nagios4 is broken and is equivalent to --with-nagios4,
+# so do not use NAGIOS4_CONFIGURE_WITH here or it breaks the NAGIOS3
+# option, cf. PR 232716.
+NAGIOS4_CONFIGURE_ON=	--with-nagios4
 NAGIOS4_RUN_DEPENDS=	nagios4>=4.4:net-mgmt/nagios4
 PERL_RUN_DEPENDS=	p5-Monitoring-Livestatus>=0:net-mgmt/p5-Monitoring-Livestatus
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904150834.x3F8YmVa088230>