Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Feb 2017 09:01:38 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r434399 - head/net-mgmt/mk-livestatus
Message-ID:  <201702190901.v1J91c8c099638@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> 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 <bsd.port.options.mk>
-
 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



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