From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 9 22:30:24 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C7BC3349 for ; Tue, 9 Oct 2012 22:30:24 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 9F8A88FC1A for ; Tue, 9 Oct 2012 22:30:24 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q99MUOAh043656 for ; Tue, 9 Oct 2012 22:30:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q99MUOft043655; Tue, 9 Oct 2012 22:30:24 GMT (envelope-from gnats) Resent-Date: Tue, 9 Oct 2012 22:30:24 GMT Resent-Message-Id: <201210092230.q99MUOft043655@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor Pali Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D7E468B2 for ; Tue, 9 Oct 2012 18:42:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id A7E0E8FC18 for ; Tue, 9 Oct 2012 18:42:52 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q99IgqHT057516 for ; Tue, 9 Oct 2012 18:42:52 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q99IgqNc057515; Tue, 9 Oct 2012 18:42:52 GMT (envelope-from nobody) Message-Id: <201210091842.q99IgqNc057515@red.freebsd.org> Date: Tue, 9 Oct 2012 18:42:52 GMT From: Gabor Pali To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/172546: [net-mgmt/nfdump-devel] OptionsNG Conversion X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2012 22:30:24 -0000 >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 +FT2NFDUMP_DESC= With Flow-tools to nfdump converter +SFLOW_DESC= Build sflow collector daemon also +NFDUMP14_DESC= Enable compatbility with version 1.4 + +.include .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 +.include >Release-Note: >Audit-Trail: >Unformatted: