svn commit: r303680 - head/net-mgmt/netdisco

[Bryan Drewery]

Author: bdrewery
Date: Tue Sep  4 23:21:31 2012
New Revision: 303680
URL: http://svn.freebsd.org/changeset/ports/303680

Log:
  - Convert to new options framework [1]
  - Fix build with new bsd.apache.mk by changing
    to USE_APACHE_RUN, since this port has NO_BUILD
  
  PR:		ports/171284 [1]
  Submitted by:	Geoffroy Desvernay <dgeo at centrale-marseille.fr> (maintainer)
  Approved by:	eadler (mentor)

Modified:
  head/net-mgmt/netdisco/Makefile

Modified: head/net-mgmt/netdisco/Makefile
==============================================================================
--- head/net-mgmt/netdisco/Makefile	Tue Sep  4 22:38:45 2012	(r303679)
+++ head/net-mgmt/netdisco/Makefile	Tue Sep  4 23:21:31 2012	(r303680)
@@ -13,9 +13,11 @@ MASTER_SITES=	SF
 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
+OPTIONS_DEFAULT=GRAPHVIZ MIBS
+MIBS_DESC=	Depend on net-mgmt/netdisco-mibs
+OUIDL_DESC=	Download oui.txt file
+GRAPHVIZ_DESC=	Install GraphViz for network map support
 
 RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
 		p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI	\
@@ -36,7 +38,7 @@ GROUPS=		netdisco
 
 USE_PERL5=	yes
 USE_PGSQL=	yes
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 
 USE_RC_SUBR=	netdisco
 
@@ -62,7 +64,7 @@ DOCS=		doc/*.pod doc/*.html INSTALL READ
 .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-Digest-MD5>=2.16:${PORT
 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 @@ do-install:
 		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