svn commit: r439845 - in head/net-mgmt: flowviewer p5-Cflow

[Larry Rosenman]

Author: ler
Date: Sun Apr 30 21:24:12 2017
New Revision: 439845
URL: https://svnweb.freebsd.org/changeset/ports/439845

Log:
  Remove options depending on expired net-mgmt/flow-tools-ng
  
  While here, pet portlint
  
  Approved by:	adamw (mentor, implicit)

Modified:
  head/net-mgmt/flowviewer/Makefile
  head/net-mgmt/p5-Cflow/Makefile

Modified: head/net-mgmt/flowviewer/Makefile
==============================================================================
--- head/net-mgmt/flowviewer/Makefile	Sun Apr 30 20:56:08 2017	(r439844)
+++ head/net-mgmt/flowviewer/Makefile	Sun Apr 30 21:24:12 2017	(r439845)
@@ -3,7 +3,7 @@
 
 PORTNAME=	flowviewer
 PORTVERSION=	4.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	FlowViewer_${DISTVERSION}
@@ -13,16 +13,10 @@ MAINTAINER=	samm at os2.kiev.ua
 COMMENT=	Web-based user interface for the flow-tools NetFlow data
 
 RUN_DEPENDS=	p5-GD-Graph>=0:graphics/p5-GD-Graph \
-		rrdtool:databases/rrdtool
+		rrdtool:databases/rrdtool \
+		rwptoflow:security/silktools
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_SINGLE=	NETFLOWv
-OPTIONS_SINGLE_NETFLOWv=	NETFLOWv5 NETFLOWv9
-OPTIONS_DEFAULT=	NETFLOWv5
-NETFLOWv5_DESC=	Support for NETFLOWv5
-NETFLOWv9_DESC=	Support for IPFIX/NETFLOWv9
-NETFLOWv5_RUN_DEPENDS=	flow-cat:net-mgmt/flow-tools-ng
-NETFLOWv9_RUN_DEPENDS=	rwptoflow:security/silktools
 
 FLOWVIEWERDIR?=	${PREFIX}/www/flowviewer
 

Modified: head/net-mgmt/p5-Cflow/Makefile
==============================================================================
--- head/net-mgmt/p5-Cflow/Makefile	Sun Apr 30 20:56:08 2017	(r439844)
+++ head/net-mgmt/p5-Cflow/Makefile	Sun Apr 30 21:24:12 2017	(r439845)
@@ -12,20 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fw at moov.de
 COMMENT=	Analyze raw flow files written by cflowd (Cisco NetFlow data)
 
-OPTIONS_SINGLE=	FT
-OPTIONS_SINGLE_FT=	FLOW_TOOLS FLOW_TOOLS_NG
-OPTIONS_DEFAULT=	FLOW_TOOLS
-FLOW_TOOLS_DESC=	Enable flow-tools support
-FLOW_TOOLS_NG_DESC=	Enable flow-tools-ng support
+BUILD_DEPENDS=	${LOCALBASE}/lib/libft.a:net-mgmt/flow-tools
+RUN_DEPENDS=	${LOCALBASE}/lib/libft.a:net-mgmt/flow-tools
 
 USES=		perl5
 USE_PERL5=	configure
 
-FLOW_TOOLS_BUILD_DEPENDS=	${LOCALBASE}/lib/libft.a:net-mgmt/flow-tools
-FLOW_TOOLS_RUN_DEPENDS=	${LOCALBASE}/lib/libft.a:net-mgmt/flow-tools
-FLOW_TOOLS_NG_BUILD_DEPENDS=	${LOCALBASE}/lib/libft.a:net-mgmt/flow-tools-ng
-FLOW_TOOLS_NG_RUN_DEPENDS=	${LOCALBASE}/lib/libft.a:net-mgmt/flow-tools-ng
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\.\./\.\./lib|${LOCALBASE}/lib|g' ${WRKSRC}/Makefile.PL