Bug 183901 - [PATCH] net-mgmt/p5-Cflow: Add support for flow-tools-ng
Summary: [PATCH] net-mgmt/p5-Cflow: Add support for flow-tools-ng
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Philippe Audeoud
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-12 15:40 UTC by Sevan Janiyan
Modified: 2013-11-12 22:20 UTC (History)
1 user (show)

See Also:


Attachments
p5-Cflow-1.053_1.patch (1.41 KB, patch)
2013-11-12 15:40 UTC, Sevan Janiyan
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Sevan Janiyan 2013-11-12 15:40:00 UTC
Add support for net-mgmt/flow-tools-ng so that flowdumper works with captured flows from a flow-tools-ng collector.
Change a tab to a space after WWW in pkg-descr (raised by portlint)

Port maintainer (fw@moov.de) is cc'd.

Generated with FreeBSD Port Tools 0.99_10 (mode: change, diff: SVN)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-11-12 15:40:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->perl

perl@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-11-12 15:40:09 UTC
Maintainer of net-mgmt/p5-Cflow,

Please note that PR ports/183901 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183901

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2013-11-12 15:40:10 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Philippe Audeoud freebsd_committer freebsd_triage 2013-11-12 15:45:21 UTC
Responsible Changed
From-To: perl->jadawin

I'll take it.
Comment 5 Frank Wall 2013-11-12 16:47:27 UTC
On 2013-11-12 15:40, Edwin Groothuis wrote:
> Maintainer of net-mgmt/p5-Cflow,
> Please note that PR ports/183901 has just been submitted.

I've no objections, so please go ahead and commit.
Though I need to mention that I did not test the patch.



Regards
- Frank
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-11-12 22:19:28 UTC
Author: jadawin
Date: Tue Nov 12 22:19:20 2013
New Revision: 333631
URL: http://svnweb.freebsd.org/changeset/ports/333631

Log:
  - Add option for flow-tools-ng
  
  PR:		ports/183901
  Submitted by:	Sevan Janiyan <venture37@geeklan.co.uk>
  Approved by:	maintainer

Modified:
  head/net-mgmt/p5-Cflow/Makefile
  head/net-mgmt/p5-Cflow/pkg-descr   (contents, props changed)
  head/net-mgmt/p5-Cflow/pkg-plist   (contents, props changed)

Modified: head/net-mgmt/p5-Cflow/Makefile
==============================================================================
--- head/net-mgmt/p5-Cflow/Makefile	Tue Nov 12 22:15:39 2013	(r333630)
+++ head/net-mgmt/p5-Cflow/Makefile	Tue Nov 12 22:19:20 2013	(r333631)
@@ -12,26 +12,32 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fw@moov.de
 COMMENT=	Analyze raw flow files written by cflowd (Cisco NetFlow data)
 
-OPTIONS_DEFINE=	FLOW_TOOLS
+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
 
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFLOW_TOOLS}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libft.a:${PORTSDIR}/net-mgmt/flow-tools
 RUN_DEPENDS+=	${LOCALBASE}/lib/libft.a:${PORTSDIR}/net-mgmt/flow-tools
+.endif
+
+.if ${PORT_OPTIONS:MFLOW_TOOLS_NG}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libft.a:${PORTSDIR}/net-mgmt/flow-tools-ng
+RUN_DEPENDS+=	${LOCALBASE}/lib/libft.a:${PORTSDIR}/net-mgmt/flow-tools-ng
+.endif
 
+.if ${PORT_OPTIONS:MFLOW_TOOLS}||${PORT_OPTIONS:MFLOW_TOOLS_NG}
 CFLAGS+=	-I${LOCALBASE}/include -DOSU
 CONFIGURE_ARGS+=	\
 	"LDDLFLAGS= -shared -L${LOCALBASE}/lib -lft -lz" \
 	"INC= -I${LOCALBASE}/include" "LDLOADLIBS= -L${LOCALBASE}/lib -lft -lz"
 .endif
 
-MAN1=		flowdumper.1
-MAN3=		Cflow.3
-
 .include <bsd.port.mk>

Modified: head/net-mgmt/p5-Cflow/pkg-descr
==============================================================================
--- head/net-mgmt/p5-Cflow/pkg-descr	Tue Nov 12 22:15:39 2013	(r333630)
+++ head/net-mgmt/p5-Cflow/pkg-descr	Tue Nov 12 22:19:20 2013	(r333631)
@@ -1,4 +1,4 @@
 Cflow is a perl module for analyzing raw flow files written by
 cflowd, a package used to collect Cisco NetFlow data.
 
-WWW:	http://net.doit.wisc.edu/~plonka/Cflow/
+WWW: http://net.doit.wisc.edu/~plonka/Cflow/

Modified: head/net-mgmt/p5-Cflow/pkg-plist
==============================================================================
--- head/net-mgmt/p5-Cflow/pkg-plist	Tue Nov 12 22:15:39 2013	(r333630)
+++ head/net-mgmt/p5-Cflow/pkg-plist	Tue Nov 12 22:19:20 2013	(r333631)
@@ -4,4 +4,6 @@ bin/flowdumper
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/Cflow.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/.packlist
+%%PERL5_MAN3%%/Cflow.3.gz
+man/man1/flowdumper.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 Philippe Audeoud freebsd_committer freebsd_triage 2013-11-12 22:19:58 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!