From owner-svn-ports-all@freebsd.org Mon Apr 15 08:34:49 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F0DB156C3FB; Mon, 15 Apr 2019 08:34:49 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 41FBE6F2FB; Mon, 15 Apr 2019 08:34:49 +0000 (UTC) (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1003A5886; Mon, 15 Apr 2019 08:34:49 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3F8YmDM088231; Mon, 15 Apr 2019 08:34:48 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3F8YmVa088230; Mon, 15 Apr 2019 08:34:48 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201904150834.x3F8YmVa088230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 15 Apr 2019 08:34:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499002 - head/net-mgmt/mk-livestatus X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/net-mgmt/mk-livestatus X-SVN-Commit-Revision: 499002 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 41FBE6F2FB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2019 08:34:49 -0000 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 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