ports/73630: Update port: net-mgmt/p5-Cflow

[Gea-Suan Lin]

>Number:         73630
>Category:       ports
>Synopsis:       Update port: net-mgmt/p5-Cflow
>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:   Sat Nov 06 22:50:35 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Gea-Suan Lin
>Release:        FreeBSD 4.10-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD netnews.NCTU.edu.tw 4.10-RELEASE-p2 FreeBSD 4.10-RELEASE-p2 #0: Tue Aug 10 21:24:00 CST 2004 root at netnews.NCTU.edu.tw:/da1/usr.obj/da0/usr.src/sys/NETNEWS i386


	
>Description:
	* 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.
	
>How-To-Repeat:
	
>Fix:

diff -ruN /usr/ports/net-mgmt/p5-Cflow/Makefile p5-Cflow/Makefile
--- /usr/ports/net-mgmt/p5-Cflow/Makefile	Mon Jul 26 16:39:04 2004
+++ p5-Cflow/Makefile	Sun Nov  7 06:44:01 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	Cflow
 PORTVERSION=	1.051
+PORTVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	http://net.doit.wisc.edu/~plonka/Cflow/
 PKGNAMEPREFIX=	p5-
@@ -14,11 +15,13 @@
 MAINTAINER=	ports at 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 -ruN /usr/ports/net-mgmt/p5-Cflow/files/patch-Cflow.xs p5-Cflow/files/patch-Cflow.xs
--- /usr/ports/net-mgmt/p5-Cflow/files/patch-Cflow.xs	Thu Jan  1 08:00:00 1970
+++ p5-Cflow/files/patch-Cflow.xs	Sun Nov  7 06:43:31 2004
@@ -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;
	


>Release-Note:
>Audit-Trail:
>Unformatted: