ports/172526: [net-mgmt/nfdump] OptionsNG Conversion

[Gabor Pali]

>Number:         172526
>Category:       ports
>Synopsis:       [net-mgmt/nfdump] OptionsNG Conversion
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 09 22:30:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Gabor Pali
>Release:        n/a
>Organization:
The FreeBSD Project
>Environment:
n/a
>Description:
- Convert options to OptionsNG format

>How-To-Repeat:

>Fix:
See the attached patch.


Patch attached with submission follows:

diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index a4c24e3..3cd66c2 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -21,19 +21,26 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 #flow-tools support
-OPTIONS=	FT2NFDUMP	"With Flow-tools to nfdump converter" off \
-		NFPROFILE	"With nfprofile  (nfsen requires it)" on \
-		FIXTIMEBUG      "With fixing swap time bug of some v5" off \
-		READPCAP        "With pcap support" off \
-		NFTRACK         "With PortTracker support" off \
-		SFLOW		"Build sflow collector daemon also" off
+OPTIONS_DEFINE=		FT2NFDUMP NFPROFILE FIXTIMEBUG READPCAP NFTRACK \
+			SFLOW NFDUMP15
+OPTIONS_DEFAULT=	NFPROFILE
 
-.include <bsd.port.pre.mk>
+FT2NFDUMP_DESC=		With Flow-tools to nfdump converter
+NFPROFILE_DESC=		With nfprofile (nfsen requires it)
+FIXTIMEBUG_DESC=	With fixing swap time bug of some v5
+READPCAP_DESC=		With pcap support
+NFTRACK_DESC=		With PortTracker support
+SFLOW_DESC=		Build sflow collector daemon also
+NFDUMP15_DESC=		Enable compatbility with version 1.5
+
+.include <bsd.port.options.mk>
 
 #for compatibility
 #
-.ifndef(WITHOUT_NFDUMP15_SUPPORT)
-CONFIGURE_ARGS=		--enable-compat15
+.if ${PORT_OPTIONS:MNFDUMP15}
+CONFIGURE_ARGS+=	--enable-compat15
+.else
+CONFIGURE_ARGS+=	--disable-compat15
 .endif
 
 PLIST_FILES=	bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay
@@ -41,48 +48,58 @@ MAN1=		nfanon.1 nfcapd.1 nfdump.1 nfexpire.1 nfreplay.1
 MAN1+=		ft2nfdump.1 nfprofile.1 sfcapd.1
 PORTDOCS=	AUTHORS ChangeLog INSTALL README
 
-.if defined(WITH_FIXTIMEBUG)
+.if ${PORT_OPTIONS:MFIXTIMEBUG}
 CONFIGURE_ARGS+=	--enable-fixtimebug
+.else
+CONFIGURE_ARGS+=	--disable-fixtimebug
 .endif
 
-.if defined(WITH_NFPROFILE)
+.if ${PORT_OPTIONS:MNFPROFILE}
 CONFIGURE_ARGS+=	--enable-nfprofile
 PLIST_FILES+=	bin/nfprofile
+.else
+CONFIGURE_ARGS+=	--disable-nfprofile
 .endif
 
-.if defined(WITH_NFTRACK)
+.if ${PORT_OPTIONS:MNFTRACK}
 CONFIGURE_ARGS+=	--enable-nftrack
 PLIST_FILES+=	bin/nftrack
+.else
+CONFIGURE_ARGS+=	--disable-nftrack
 .endif
 
-.if defined(WITH_NFPROFILE) || defined(WITH_NFTRACK)
+.if ${PORT_OPTIONS:MNFPROFILE} || ${PORT_OPTIONS:MNFTRACK}
 CONFIGURE_ARGS+=	--with-rrdpath=${LOCALBASE}
 BUILD_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool
 RUN_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool
 .endif
 
 #flow-tools support
-.if defined(WITH_FT2NFDUMP)
+.if ${PORT_OPTIONS:MFT2NFDUMP}
 BUILD_DEPENDS+=		flow-cat:${PORTSDIR}/net-mgmt/flow-tools
 CONFIGURE_ARGS+=	--enable-ftconv --with-ftpath=${LOCALBASE}
 PLIST_FILES+=	bin/ft2nfdump
 .endif
 
-.if defined (WITH_READPCAP)
+.if ${PORT_OPTIONS:MREADPCAP}
 CONFIGURE_ARGS+=	--enable-readpcap
+.else
+CONFIGURE_ARGS+=	--disable-readpcap
 .endif
 
 #sflow capture support
-.if defined(WITH_SFLOW)
+.if ${PORT_OPTIONS:MSFLOW}
 CONFIGURE_ARGS+=	--enable-sflow
 PLIST_FILES+=	bin/sfcapd
 #MAN1+=		sfcapd.1
+.else
+CONFIGURE_ARGS+=	--disable-sflow
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>


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