svn commit: r499003 - branches/2019Q2/net-mgmt/mk-livestatus

[Tobias Kortkamp]

Author: tobik
Date: Mon Apr 15 08:35:56 2019
New Revision: 499003
URL: https://svnweb.freebsd.org/changeset/ports/499003

Log:
  MFH: r499002
  
  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 at yandex.ru>
  Approved by:	egypcio (maintainer)
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2019Q2/net-mgmt/mk-livestatus/Makefile
Directory Properties:
  branches/2019Q2/   (props changed)

Modified: branches/2019Q2/net-mgmt/mk-livestatus/Makefile
==============================================================================
--- branches/2019Q2/net-mgmt/mk-livestatus/Makefile	Mon Apr 15 08:34:48 2019	(r499002)
+++ branches/2019Q2/net-mgmt/mk-livestatus/Makefile	Mon Apr 15 08:35:56 2019	(r499003)
@@ -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