From owner-svn-ports-head@freebsd.org Sun Feb 19 09:01:39 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE8D4CE5560; Sun, 19 Feb 2017 09:01:39 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id 7292D1276; Sun, 19 Feb 2017 09:01:39 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1J91cvb099640; Sun, 19 Feb 2017 09:01:38 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1J91c8c099638; Sun, 19 Feb 2017 09:01:38 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201702190901.v1J91c8c099638@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 19 Feb 2017 09:01:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434399 - head/net-mgmt/mk-livestatus 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.23 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: Sun, 19 Feb 2017 09:01:39 -0000 Author: amdmi3 Date: Sun Feb 19 09:01:38 2017 New Revision: 434399 URL: https://svnweb.freebsd.org/changeset/ports/434399 Log: - Switch to options helpers - Remove redundant SUB_LIST and unneeded inclusion Modified: head/net-mgmt/mk-livestatus/Makefile head/net-mgmt/mk-livestatus/pkg-descr Modified: head/net-mgmt/mk-livestatus/Makefile ============================================================================== --- head/net-mgmt/mk-livestatus/Makefile Sun Feb 19 08:32:51 2017 (r434398) +++ head/net-mgmt/mk-livestatus/Makefile Sun Feb 19 09:01:38 2017 (r434399) @@ -15,21 +15,9 @@ LICENSE= GPLv2 USES= compiler:c++11-lib gmake GNU_CONFIGURE= yes -OPTIONS_SINGLE= NAGIOS -OPTIONS_SINGLE_NAGIOS= NAGIOS3 NAGIOS4 -OPTIONS_DEFAULT= NAGIOS3 - -NAGIOS3_DESC= build for nagios-3.x -NAGIOS4_DESC= build for nagios-4.x - -NAGIOS4_CONFIGURE_ON= --with-nagios4 - -.include - PLIST_FILES= lib/mk-livestatus/unixcat \ lib/mk-livestatus/livestatus.o SUB_FILES= pkg-message -SUB_LIST= PREFIX=${PREFIX} PORTEXAMPLES= * EXAMPLE_FILES= api/python/example_multisite.py \ @@ -41,6 +29,16 @@ EXAMPLE_FILES= api/python/example_multis # parameter "command_file" from nagios.cfg COMMAND_FILE?= /var/spool/nagios/rw/live +OPTIONS_DEFINE= EXAMPLES +OPTIONS_SINGLE= NAGIOS +OPTIONS_SINGLE_NAGIOS= NAGIOS3 NAGIOS4 +OPTIONS_DEFAULT= NAGIOS3 + +NAGIOS3_DESC= build for nagios-3.x +NAGIOS4_DESC= build for nagios-4.x + +NAGIOS4_CONFIGURE_ON= --with-nagios4 + # perl api is really outdated, do not install! # Actual version can be found on CPAN # http://search.cpan.org/~nierlein/Monitoring-Livestatus/ @@ -55,7 +53,7 @@ post-patch: @${SED} -i '' -e 's|/usr/local/nagios/var/rw/live|${COMMAND_FILE}|' \ ${WRKSRC}/src/livestatus.h -post-install: +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ( cd ${WRKSRC} && ${COPYTREE_SHARE} api\* ${STAGEDIR}${EXAMPLESDIR}/ ) Modified: head/net-mgmt/mk-livestatus/pkg-descr ============================================================================== --- head/net-mgmt/mk-livestatus/pkg-descr Sun Feb 19 08:32:51 2017 (r434398) +++ head/net-mgmt/mk-livestatus/pkg-descr Sun Feb 19 09:01:38 2017 (r434399) @@ -9,5 +9,4 @@ actively write out data e.g. to the disk external applications to connect to and fetch the current status information from Nagios. - WWW: http://mathias-kettner.de/checkmk_livestatus.html