ports/171284: [MAINTAINER] net-mgmt/netdisco: OPTIONS ng

[Geoffroy Desvernay]

>Number:         171284
>Category:       ports
>Synopsis:       [MAINTAINER] net-mgmt/netdisco: OPTIONS ng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 03 15:50:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Geoffroy Desvernay
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 9.0-STABLE FreeBSD 9.0-STABLE #0: Wed Jun 20 12:43:59 CEST 2012
>Description:
Use nes OPTIONS framework

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix)
>How-To-Repeat:
>Fix:

--- netdisco-1.1.patch begins here ---
diff -ruN --exclude=CVS ../netdisco.orig/Makefile ./Makefile
--- ../netdisco.orig/Makefile	2012-08-18 16:29:08.000000000 +0200
+++ ./Makefile	2012-09-03 14:41:13.000000000 +0200
@@ -13,9 +13,11 @@
 MAINTAINER=	dgeo at centrale-marseille.fr
 COMMENT=	Web-based network management tool for moderate to large networks
 
-OPTIONS=	GRAPHVIZ "Install GraphViz for network map support"	on \
-		OUIDL "Download oui.txt file"   off \
-		MIBS "depend on net-mgmt/netdisco-mibs" on
+OPTIONS_DEFINE=	GRAPHVIZ OUIDL MIBS
+MIBS_DESC=	depend on net-mgmt/netdisco-mibs
+OUIDL_DESC=	Download oui.txt file
+GRAPHVIZ_DESC=	Install GraphViz for network map support
+OPTIONS_DEFAULT=	GRAPHVIZ MIBS
 
 RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
 		p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI	\
@@ -62,7 +64,7 @@
 .include <bsd.port.pre.mk>
 
 MIBSDIR=	${PREFIX}/share/netdisco-mibs
-.if defined(WITH_MIBS)
+.if ${PORT_OPTIONS:MMIBS}
 RUN_DEPENDS+=	${MIBSDIR}/mib_index.txt:${PORTSDIR}/net-mgmt/netdisco-mibs
 BUILD_DEPENDS+=	${MIBSDIR}/mib_index.txt:${PORTSDIR}/net-mgmt/netdisco-mibs
 . include 	"${.CURDIR}/../netdisco-mibs/bsd.port.netdisco.mk"
@@ -83,12 +85,12 @@
 RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
 .endif
 
-.if defined(WITH_GRAPHVIZ)
+.if ${PORT_OPTIONS:MGRAPHVIZ}
 RUN_DEPENDS+=	p5-Graph>=0:${PORTSDIR}/math/p5-Graph	\
 		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
 .endif
 
-.if defined(WITH_OUIDL)
+.if ${PORT_OPTIONS:MOUIDL}
 PLIST_SUB+=	OUIDL=""
 .else
 PLIST_SUB+=	OUIDL="@comment "
@@ -161,7 +163,7 @@
 		fi)
 .	endif
 
-.	if defined(WITH_OUIDL)
+.	if ${PORT_OPTIONS:MOUIDL}
 		${FETCH_CMD} -q -o ${DATADIR}/oui.txt http://standards.ieee.org/develop/regauth/oui/oui.txt
 .	endif
 
--- netdisco-1.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: