From owner-svn-ports-all@FreeBSD.ORG  Tue Sep 11 15:11:40 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 128C71065741;
	Tue, 11 Sep 2012 15:11:40 +0000 (UTC)
	(envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D8B588FC15;
	Tue, 11 Sep 2012 15:11:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8BFBdJ5072266;
	Tue, 11 Sep 2012 15:11:39 GMT
	(envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8BFBdiW072264;
	Tue, 11 Sep 2012 15:11:39 GMT
	(envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201209111511.q8BFBdiW072264@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 11 Sep 2012 15:11:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304099 - head/net-mgmt/ndoutils
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Sep 2012 15:11:40 -0000

Author: bdrewery
Date: Tue Sep 11 15:11:39 2012
New Revision: 304099
URL: http://svn.freebsd.org/changeset/ports/304099

Log:
  - Convert to new options framework
  - Add missing dependency on perl
  - Bump PORTREVISION due to added dependency
  
  Approved by:	eadler, bapt (mentors, implicit)

Modified:
  head/net-mgmt/ndoutils/Makefile

Modified: head/net-mgmt/ndoutils/Makefile
==============================================================================
--- head/net-mgmt/ndoutils/Makefile	Tue Sep 11 14:27:22 2012	(r304098)
+++ head/net-mgmt/ndoutils/Makefile	Tue Sep 11 15:11:39 2012	(r304099)
@@ -7,7 +7,7 @@
 
 PORTNAME=	ndoutils
 PORTVERSION=	1.4b8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nagios/${PORTNAME}-1.x/${PORTNAME}-${PORTVERSION}
 
@@ -16,8 +16,11 @@ COMMENT=	Keep Nagios perfdata in MySQL o
 
 RUN_DEPENDS=	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios
 
-OPTIONS=	MYSQL	"MySQL Backend"		on \
-			PGSQL	"Postgresql Backend"	off
+OPTIONS_MULTI=		BACKEND
+OPTIONS_MULTI_BACKEND=	MYSQL PGSQL
+OPTIONS_DEFAULT=	MYSQL
+MYSQL_DESC=		MySQL backend support
+PGSQL_DESC=		Postgresql backend support
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -27,11 +30,13 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/
 
 CFG_FILES=	misccommands ndo2db ndomod
 
+USE_PERL5=	yes
 USE_RC_SUBR=	ndo2db
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
-.if !defined(WITHOUT_MYSQL)
+
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=yes
 CONFIGURE_ARGS+=	--enable-mysql \
 					--with-mysql-lib=${LOCALBASE}/lib/mysql \
@@ -40,7 +45,7 @@ CONFIGURE_ARGS+=	--enable-mysql \
 CONFIGURE_ARGS+=	--disable-mysql
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=yes
 CONFIGURE_ARGS+=	--enable-pgsql \
 					--with-pgsql-lib=${LOCALBASE}/lib/pgsql \
@@ -49,10 +54,6 @@ CONFIGURE_ARGS+=	--enable-pgsql \
 CONFIGURE_ARGS+=	--disable-pgsql
 .endif
 
-.if defined(WITHOUT_MYSQL) && defined(WITHOUT_PGSQL)
-IGNORE=	you should define at least 1 of WITH_MYSQL or WITH_PGSQL, WITH_MYSQL=yes is the default
-.endif
-
 .if !defined(NOPORTDOCS)
 PLIST_SUB+=	PORTDOCS=""
 .else