Attachment 103196 Details for Bug 143087 – nfdump-1.6.patch

[patch] nfdump-1.6.patch

nfdump-1.6.patch (text/plain), 5.12 KB, created by Janos Mohacsi on 2010-01-22 16:00:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Janos Mohacsi

Created: 2010-01-22 16:00:10 UTC

Size: 5.12 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/Makefile /usr/ports/net-mgmt/nfdump/Makefile
>--- /usr/ports/net-mgmt/nfdump.orig/Makefile	2009-11-26 17:00:57.000000000 +0100
>+++ /usr/ports/net-mgmt/nfdump/Makefile	2010-01-22 16:48:41.000000000 +0100
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	nfdump
>-PORTVERSION=	1.5.8
>+PORTVERSION=	1.6
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
> 
>@@ -23,20 +23,15 @@
> 
> .include <bsd.port.pre.mk>
> 
>-#for compatibility
>-#
>-.ifndef(WITHOUT_NFDUMP14_SUPPORT)
>-CONFIGURE_ARGS=		--enable-compat14
>-.endif
>-
> PLIST_FILES=	bin/nfcapd bin/nfdump bin/nfreplay bin/nfexpire
> MAN1=		nfcapd.1 nfdump.1 nfreplay.1 nfexpire.1
>+MAN1+=		nfprofile.1 ft2nfdump.1 sfcapd.1
> PORTDOCS=	AUTHORS ChangeLog INSTALL README
> 
> .if defined(WITH_NFPROFILE)
> CONFIGURE_ARGS+=	--enable-nfprofile --with-rrdpath=${LOCALBASE}
> PLIST_FILES+=	bin/nfprofile
>-MAN1+=		nfprofile.1
>+#MAN1+=		nfprofile.1
> BUILD_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool
> RUN_DEPENDS+=	${BUILD_DEPENDS}
> .endif
>@@ -46,14 +41,14 @@
> BUILD_DEPENDS+=		flow-cat:${PORTSDIR}/net-mgmt/flow-tools
> CONFIGURE_ARGS+=	--enable-ftconv --with-ftpath=${LOCALBASE}
> PLIST_FILES+=	bin/ft2nfdump
>-MAN1+=		ft2nfdump.1
>+#MAN1+=		ft2nfdump.1
> .endif
> 
> #sflow capture support
> .if defined(WITH_SFLOW)
> CONFIGURE_ARGS+=	--enable-sflow
> PLIST_FILES+=	bin/sfcapd
>-MAN1+=		sfcapd.1
>+#MAN1+=		sfcapd.1
> .endif
> 
> .if !defined(NOPORTDOCS)
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/distinfo /usr/ports/net-mgmt/nfdump/distinfo
>--- /usr/ports/net-mgmt/nfdump.orig/distinfo	2009-07-08 01:26:35.000000000 +0200
>+++ /usr/ports/net-mgmt/nfdump/distinfo	2010-01-22 16:30:08.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (nfdump-1.5.8.tar.gz) = f314513652df18259f8303c542918cbb
>-SHA256 (nfdump-1.5.8.tar.gz) = 3fbfb874377316cf322cf13cfab667207fe78e0910bbc82ba012e3a77c00de36
>-SIZE (nfdump-1.5.8.tar.gz) = 331279
>+MD5 (nfdump-1.6.tar.gz) = 772405b071202d65869a8b0987db60e5
>+SHA256 (nfdump-1.6.tar.gz) = 8ef140ed68e4232864602f0093cb7e225996fd83068822bf3dc569cb5c0309b4
>+SIZE (nfdump-1.6.tar.gz) = 494131
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/files/patch-Makefile.in /usr/ports/net-mgmt/nfdump/files/patch-Makefile.in
>--- /usr/ports/net-mgmt/nfdump.orig/files/patch-Makefile.in	2007-10-07 02:48:15.000000000 +0200
>+++ /usr/ports/net-mgmt/nfdump/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,16 +0,0 @@
>-
>-$FreeBSD: ports/net-mgmt/nfdump/files/patch-Makefile.in,v 1.7 2007/10/07 00:48:15 miwi Exp $
>-
>---- Makefile.in.orig
>-+++ Makefile.in
>-@@ -108,8 +108,8 @@
>- 	test -d $(MANDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
>- 	for file in $(OBJECTS); do \
>- 		if [ -f $$file.1 ]; then \
>--			$(INSTALL) -o root -g bin -m 755 $$file $(PREFIX)/bin ; \
>--			$(INSTALL) -o root -g bin -m 644 $$file.1 $(MANDIR)/man1 ; \
>-+			$(BSD_INSTALL_PROGRAM) $$file $(PREFIX)/bin ; \
>-+			$(BSD_INSTALL_MAN) $$file.1 $(MANDIR)/man1 ; \
>- 		fi \
>- 	done;
>- 
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/files/patch-bin_ft2nfdump.c /usr/ports/net-mgmt/nfdump/files/patch-bin_ft2nfdump.c
>--- /usr/ports/net-mgmt/nfdump.orig/files/patch-bin_ft2nfdump.c	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/net-mgmt/nfdump/files/patch-bin_ft2nfdump.c	2010-01-22 16:43:57.000000000 +0100
>@@ -0,0 +1,14 @@
>+
>+$FreeBSD$
>+
>+--- bin/ft2nfdump.c.orig
>++++ bin/ft2nfdump.c
>+@@ -68,7 +68,7 @@
>+ #include "nfx.h"
>+ #include "launch.h"
>+ 
>+-#include "ftbuild.h"
>++/*#include "ftbuild.h"*/
>+ 
>+ /* Global defines */
>+ #define MAXRECORDS 30
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/files/patch-configure /usr/ports/net-mgmt/nfdump/files/patch-configure
>--- /usr/ports/net-mgmt/nfdump.orig/files/patch-configure	2006-04-02 00:57:30.000000000 +0200
>+++ /usr/ports/net-mgmt/nfdump/files/patch-configure	2010-01-22 16:42:28.000000000 +0100
>@@ -1,9 +1,9 @@
> 
>-$FreeBSD: ports/net-mgmt/nfdump/files/patch-configure,v 1.1 2006/04/01 22:57:30 pav Exp $
>+$FreeBSD$
> 
> --- configure.orig
> +++ configure
>-@@ -2843,7 +2843,7 @@
>+@@ -4011,7 +4011,7 @@
>  fi
>  
>  if test -d "$WHERE_FTPATH"; then
>@@ -12,7 +12,7 @@
>  		{ { echo "$as_me:$LINENO: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&5
>  echo "$as_me: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&2;}
>     { (exit 1); exit 1; }; }
>-@@ -2853,7 +2853,7 @@
>+@@ -4021,7 +4021,7 @@
>  echo "$as_me: error: libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first" >&2;}
>     { (exit 1); exit 1; }; }
>  	fi
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/files/patch-ft2nfdump.c /usr/ports/net-mgmt/nfdump/files/patch-ft2nfdump.c
>--- /usr/ports/net-mgmt/nfdump.orig/files/patch-ft2nfdump.c	2007-10-07 02:48:15.000000000 +0200
>+++ /usr/ports/net-mgmt/nfdump/files/patch-ft2nfdump.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,14 +0,0 @@
>-
>-$FreeBSD: ports/net-mgmt/nfdump/files/patch-ft2nfdump.c,v 1.3 2007/10/07 00:48:15 miwi Exp $
>-
>---- ft2nfdump.c.orig
>-+++ ft2nfdump.c
>-@@ -66,7 +66,7 @@
>- #include "nffile.h"
>- #include "launch.h"
>- 
>--#include "ftbuild.h"
>-+/*#include "ftbuild.h"*/
>- 
>- /* Global defines */
>- #define MAXRECORDS 30

Actions: View | Diff

Attachments on bug 143087: 103196