From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 16 20:17:52 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C22CA561;
 Mon, 16 Dec 2013 20:17:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id ADAE616E9;
 Mon, 16 Dec 2013 20:17:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGKHquc099191;
 Mon, 16 Dec 2013 20:17:52 GMT (envelope-from demon@svn.freebsd.org)
Received: (from demon@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGKHqwI099190;
 Mon, 16 Dec 2013 20:17:52 GMT (envelope-from demon@svn.freebsd.org)
Message-Id: <201312162017.rBGKHqwI099190@svn.freebsd.org>
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Mon, 16 Dec 2013 20:17:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336660 - head/net-mgmt/nagios-plugins
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Dec 2013 20:17:52 -0000

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