Attachment 119176 Details for Bug 161639 – file.diff

[patch] file.diff

file.diff (text/plain), 3.40 KB, created by tkato432 on 2011-10-14 19:50:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2011-10-14 19:50:27 UTC

Size: 3.40 KB

patch

obsolete

>diff -urN /usr/ports/net-mgmt/flow-extract/Makefile net-mgmt/flow-extract/Makefile
>--- /usr/ports/net-mgmt/flow-extract/Makefile	2011-08-03 15:44:14.000000000 +0900
>+++ net-mgmt/flow-extract/Makefile	2011-09-16 18:05:07.000000000 +0900
>@@ -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 -urN /usr/ports/net-mgmt/flow-extract/files/patch-Makefile net-mgmt/flow-extract/files/patch-Makefile
>--- /usr/ports/net-mgmt/flow-extract/files/patch-Makefile	2008-05-15 02:25:23.000000000 +0900
>+++ net-mgmt/flow-extract/files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/net-mgmt/flow-extract/pkg-descr net-mgmt/flow-extract/pkg-descr
>--- /usr/ports/net-mgmt/flow-extract/pkg-descr	2009-12-21 15:56:27.000000000 +0900
>+++ net-mgmt/flow-extract/pkg-descr	2011-09-15 17:38:16.000000000 +0900
>@@ -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 @@
> 
> 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

Actions: View | Diff

Attachments on bug 161639: 119176