svn commit: r336660 - head/net-mgmt/nagios-plugins

[Dmitry Sivachenko]

Author: demon
Date: Mon Dec 16 20:17:52 2013
New Revision: 336660
URL: http://svnweb.freebsd.org/changeset/ports/336660

Log:
  More compact way to handle options.
  
  Submitted by:	mat

Modified:
  head/net-mgmt/nagios-plugins/Makefile

Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile	Mon Dec 16 19:13:27 2013	(r336659)
+++ head/net-mgmt/nagios-plugins/Makefile	Mon Dec 16 20:17:52 2013	(r336660)
@@ -32,6 +32,8 @@ JAIL_DESC=	Compilation within jail(8) (s
 DBI_DESC=	Check database using DBI
 EXTRAOPTS_DESC=	Parsing of plugins ini config files for extra options
 
+EXTRAOPTS_CONFIGURE_ENABLE=	extra-opts
+
 GNU_CONFIGURE=	yes
 
 NAGIOSUSER?=	nagios
@@ -49,7 +51,7 @@ NEED_ROOT=	yes # check_icmp, check_dhcp
 
 .include <bsd.port.options.mk>
 
-CONFIGURE_ARGS=	--with-nagios-user=${NAGIOSUSER} \
+CONFIGURE_ARGS+=--with-nagios-user=${NAGIOSUSER} \
 		--with-nagios-group=${NAGIOSGROUP} \
 		--with-cgiurl=${NAGIOSCGIURL} \
 		--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
@@ -149,10 +151,6 @@ CONFIGURE_ARGS+=	--without-dbi
 PLIST_SUB+=	SUB_DBI="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MEXTRAOPTS}
-CONFIGURE_ARGS+=	--enable-extra-opts
-.endif
-
 .if ${OSVERSION} > 1000055
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-dig-to-drill.diff
 CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill