3 files changed, 17 insertions, 51 deletions

diff --git a/net-mgmt/flow-extract/Makefile b/net-mgmt/flow-extract/Makefile
index c4aafce0b9e7..cdca87aa7901 100644
--- a/net-mgmt/flow-extract/Makefile
+++ b/net-mgmt/flow-extract/Makefile
@@ -7,25 +7,31 @@
 
 PORTNAME=	flow-extract
 PORTVERSION=	2.61
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://itservices.uchicago.edu/groups/security/tools/flow-extract/
-DISTNAME=	flow-extract-${PORTVERSION}
+MASTER_SITES=	http://answers.uchicago.edu/images/group68/19876/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cisco NetFlow awk-like extracting tool
 
-BUILD_DEPENDS=	flow-cat:${PORTSDIR}/net-mgmt/flow-tools
+LICENSE=	GPLv1
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-MAN1=		flow-extract.1
-PLIST_FILES=	bin/flow-extract
+BUILD_DEPENDS=	${LOCALBASE}/include/ftlib.h:${PORTSDIR}/net-mgmt/flow-tools
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}"
+MAKE_JOBS_SAFE=	yes
+
+MAN1=		flow-extract.1
+PLIST_FILES=	bin/flow-extract
+
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS=	${LOCALBASE}/lib/libft.a -lz
 
 do-install:
-		@${INSTALL_PROGRAM}	${WRKSRC}/flow-extract ${PREFIX}/bin
-		@${INSTALL_MAN}		${WRKSRC}/flow-extract.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/flow-extract ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/flow-extract.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/flow-extract/files/patch-Makefile b/net-mgmt/flow-extract/files/patch-Makefile
deleted file mode 100644
index d1b59dab162e..000000000000
--- a/net-mgmt/flow-extract/files/patch-Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
---- /home/barzog/Makefile	2008-05-11 02:57:48.000000000 +0000
-+++ Makefile	2008-05-11 02:59:59.000000000 +0000
-@@ -10,10 +10,10 @@
- #
- # For SunOS 5, use LIBS=-lsocket -lnsl
- #
--CC=gcc
--FLAGS=-ggdb3 -gstabs -D_FILE_OFFSET_BITS=64
--LIBS=-L/opt/lib -R/opt/lib /opt/lib/libft.a -lsocket -lnsl -lz
--INCLUDES=-I/opt/include
-+#CC=gcc
-+#FLAGS=-ggdb3 -gstabs -D_FILE_OFFSET_BITS=64
-+#LIBS=-L/opt/lib -R/opt/lib /opt/lib/libft.a -lsocket -lnsl -lz
-+#INCLUDES=-I/opt/include
- #
- # For Linux
- #
-@@ -22,9 +22,9 @@
- #INCLUDES=
- #
- # For BSD
--FLAGS=-ggdb3 -gstabs -D_FILE_OFFSET_BITS=64
--LIBS=-L/usr/local/netflow/lib /usr/local/netflow/lib/libft.a -lz
--INCLUDES=-I/usr/local/netflow/include
-+CC ?= cc
-+LIBS=-L%%PREFIX%%/lib -lft -lz
-+INCLUDES=-I%%PREFIX%%/include
- #
- #
- #------------------------------------------------------------------------
-@@ -36,7 +36,7 @@
- 
- #CC = cc
- LIB=$(LIBS)
--CFLAGS=-O $(FLAGS) $(INCLUDES) 
-+CFLAGS=$(INCLUDES) 
- 
- all: flow-extract
- 
diff --git a/net-mgmt/flow-extract/pkg-descr b/net-mgmt/flow-extract/pkg-descr
index 9f2a4437bab8..8a0c08cabe3e 100644
--- a/net-mgmt/flow-extract/pkg-descr
+++ b/net-mgmt/flow-extract/pkg-descr
@@ -1,6 +1,3 @@
-A copy of this package can be found at: 
-WWW: http://security.uchicago.edu/tools/net-forensics/
-
 This package is a port of TAMU's extract program from NetLogger to look
 at flow data instead of netlogger data. Blame Larry for it's faults, not
 TAMU. Blame me for the FreeBSD port, not Larry :-)
@@ -13,3 +10,5 @@ first, then look at this program.
 
 In order for this to compile you will need flowtools from Mark
 Fullmer's (net-mgmt/flow-tools port).
+
+WWW: http://answers.uchicago.edu/page.php?id=19876