Date: Tue, 9 Oct 2012 18:42:52 GMT From: Gabor Pali <pgj@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172546: [net-mgmt/nfdump-devel] OptionsNG Conversion Message-ID: <201210091842.q99IgqNc057515@red.freebsd.org> Resent-Message-ID: <201210092230.q99MUOft043655@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172546
>Category: ports
>Synopsis: [net-mgmt/nfdump-devel] 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:24 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Gabor Pali
>Release: n/a
>Organization:
The FreeBSD Project
>Environment:
n/a
>Description:
- Convert options for OptionsNG format
>How-To-Repeat:
>Fix:
See the attached patch.
Patch attached with submission follows:
diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile
index 614bd76..3738d8a 100644
--- a/net-mgmt/nfdump-devel/Makefile
+++ b/net-mgmt/nfdump-devel/Makefile
@@ -22,10 +22,14 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-nfprofile --with-rrdpath=${LOCALBASE}
#flow-tools support
-OPTIONS= FT2NFDUMP "With Flow-tools to nfdump converter" off \
- SFLOW "Build sflow collector daemon also" off
+OPTIONS_DEFINE= FT2NFDUMP SFLOW NFDUMP14
+OPTIONS_DEFAULT=
-.include <bsd.port.pre.mk>
+FT2NFDUMP_DESC= With Flow-tools to nfdump converter
+SFLOW_DESC= Build sflow collector daemon also
+NFDUMP14_DESC= Enable compatbility with version 1.4
+
+.include <bsd.port.options.mk>
.if ${OSVERSION} < 700000
BROKEN= does not configure on 6.X
@@ -33,8 +37,10 @@ BROKEN= does not configure on 6.X
#for compatibility
#
-.ifndef(WITHOUT_NFDUMP14_SUPPORT)
+.if ${PORT_OPTIONS:MNFDUMP14}
CONFIGURE_ARGS+= --enable-compat14
+.else
+CONFIGURE_ARGS+= --disable-compat14
.endif
PLIST_FILES= bin/nfcapd bin/nfdump bin/nfreplay bin/nfexpire bin/nfprofile
@@ -42,7 +48,7 @@ MAN1= nfcapd.1 nfdump.1 nfexpire.1 nfprofile.1 nfreplay.1
PORTDOCS= AUTHORS ChangeLog INSTALL README
#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
@@ -50,16 +56,18 @@ MAN1+= ft2nfdump.1
.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210091842.q99IgqNc057515>