diff options
| author | Cheng-Lung Sung <clsung@FreeBSD.org> | 2004-11-09 08:29:46 +0000 |
|---|---|---|
| committer | Cheng-Lung Sung <clsung@FreeBSD.org> | 2004-11-09 08:29:46 +0000 |
| commit | 6fd905d46b94b134c3eb9876126337e3a0e8e3f0 (patch) | |
| tree | 4ff6accf356dd66421518904eb82550742c4a64a /net-mgmt/p5-Cflow | |
| parent | b17cc1cb1f81559e55e8be5f5742e40c8721b9fc (diff) | |
| download | ports-6fd905d46b94b134c3eb9876126337e3a0e8e3f0.tar.gz ports-6fd905d46b94b134c3eb9876126337e3a0e8e3f0.zip | |
- Use WITH_FLOW_TOOLS to specify RUN_DEPENDS.
- Use ${LOCALBASE}.
- flow-tools need zlib (so we need to add "-lz")
- Bugfix for flow-tools support.
PR: ports/73630
Submitted by: Gea-Suan Lin <gslin AT netnews dot NCTU dot edu dot tw>
Notes
Notes:
svn path=/head/; revision=121172
Diffstat (limited to 'net-mgmt/p5-Cflow')
| -rw-r--r-- | net-mgmt/p5-Cflow/Makefile | 11 | ||||
| -rw-r--r-- | net-mgmt/p5-Cflow/files/patch-Cflow.xs | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/net-mgmt/p5-Cflow/Makefile b/net-mgmt/p5-Cflow/Makefile index 0e404d8801aa..4ba62e420293 100644 --- a/net-mgmt/p5-Cflow/Makefile +++ b/net-mgmt/p5-Cflow/Makefile @@ -7,6 +7,7 @@ PORTNAME= Cflow PORTVERSION= 1.051 +PORTREVISION= 1 CATEGORIES= net-mgmt perl5 MASTER_SITES= http://net.doit.wisc.edu/~plonka/Cflow/ PKGNAMEPREFIX= p5- @@ -14,11 +15,13 @@ PKGNAMEPREFIX= p5- MAINTAINER= ports@FreeBSD.org COMMENT= Analyze raw flow files written by cflowd (Cisco NetFlow data) -.if exists(${PREFIX}/include/ftlib.h) && exists(${PREFIX}/lib/libft.a) -CFLAGS+= -I${PREFIX}/include -DOSU +.if defined(WITH_FLOW_TOOLS) +LIB_DEPENDS+= ${LOCALBASE}/lib/libft.a:${PORTSDIR}/net-mgmt/flow-tools + +CFLAGS+= -I${LOCALBASE}/include -DOSU CONFIGURE_ARGS+= \ - "LDDLFLAGS= -shared -L${PREFIX}/lib -lft" \ - "INC= -I${PREFIX}/include" "LDLOADLIBS= -L${PREFIX}/lib -lft" + "LDDLFLAGS= -shared -L${LOCALBASE}/lib -lft -lz" \ + "INC= -I${LOCALBASE}/include" "LDLOADLIBS= -L${LOCALBASE}/lib -lft -lz" .endif PERL_CONFIGURE= YES diff --git a/net-mgmt/p5-Cflow/files/patch-Cflow.xs b/net-mgmt/p5-Cflow/files/patch-Cflow.xs new file mode 100644 index 000000000000..bb3915bf991d --- /dev/null +++ b/net-mgmt/p5-Cflow/files/patch-Cflow.xs @@ -0,0 +1,11 @@ +--- Cflow.xs.old Sun Nov 7 06:42:07 2004 ++++ Cflow.xs Sun Nov 7 06:42:32 2004 +@@ -759,7 +759,7 @@ + uint32_t index; + # ifdef OSU /* [ */ + struct fttime first, last; +- if ((FILE *)0 == fp) { ++ if (0 == ftio_check_generic(&fs)) { + fdata = ftio_read(&fs); + if ((void *)0 == fdata) { + break; |