Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Oct 2012 20:03:23 +0000 (UTC)
From:      Gabor Pali <pgj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306567 - head/net-mgmt/nfdump-devel
Message-ID:  <201210282003.q9SK3NT5088786@svn.freebsd.org>

Next in thread | Raw E-Mail | Index | Archive | Help
Author: pgj
Date: Sun Oct 28 20:03:23 2012
New Revision: 306567
URL: http://svn.freebsd.org/changeset/ports/306567

Log:
  - Convert options to the new format
  
  PR:		ports/172546
  Submitted by:	pgj
  Approved by:	maintainer
  Feature safe:	yes

Modified:
  head/net-mgmt/nfdump-devel/Makefile

Modified: head/net-mgmt/nfdump-devel/Makefile
==============================================================================
--- head/net-mgmt/nfdump-devel/Makefile	Sun Oct 28 20:01:35 2012	(r306566)
+++ head/net-mgmt/nfdump-devel/Makefile	Sun Oct 28 20:03:23 2012	(r306567)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	nfdump-devel
-# Date created:				2007-05-20
-# Whom:					Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	nfdump-devel
 PORTVERSION=	20070808
@@ -22,10 +18,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=	
+
+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.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 700000
 BROKEN=		does not configure on 6.X
@@ -33,8 +33,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 +44,7 @@ MAN1=		nfcapd.1 nfdump.1 nfexpire.1 nfpr
 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 +52,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>



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?201210282003.q9SK3NT5088786>