Attachment 112236 Details for Bug 153608 – file.diff

[patch] file.diff

file.diff (text/plain), 3.69 KB, created by littlesavage on 2011-01-01 22:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: littlesavage

Created: 2011-01-01 22:10:11 UTC

Size: 3.69 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	2010-06-12 01:41:43.000000000 +0400
>+++ /usr/ports/net-mgmt/nfdump/Makefile	2011-01-02 00:56:31.421355427 +0300
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	nfdump
>-PORTVERSION=	1.6.1
>+PORTVERSION=	1.6.2
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
> 
>@@ -16,6 +16,9 @@
> GNU_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
> 
>+LICENSE=	BSD
>+LICENSE_FILE=	${WRKSRC}/BSD-license.txt
>+
> #flow-tools support
> OPTIONS=	FT2NFDUMP	"With Flow-tools to nfdump converter" off \
> 		NFPROFILE	"With nfprofile  (nfsen requires it)" on \
>@@ -23,10 +26,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} < 700000
>-BROKEN=		does not configure on 6.X
>-.endif
>-
> #for compatibility
> #
> .ifndef(WITHOUT_NFDUMP15_SUPPORT)
>@@ -39,6 +38,11 @@
> PORTDOCS=	AUTHORS ChangeLog INSTALL README
> 
> .if defined(WITH_NFPROFILE)
>+
>+.if ${OSVERSION} < 700000
>+BROKEN=         does not configure on 6.X
>+.endif
>+
> CONFIGURE_ARGS+=	--enable-nfprofile --with-rrdpath=${LOCALBASE}
> PLIST_FILES+=	bin/nfprofile
> #MAN1+=		nfprofile.1
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/distinfo /usr/ports/net-mgmt/nfdump/distinfo
>--- /usr/ports/net-mgmt/nfdump.orig/distinfo	2010-05-31 03:57:08.000000000 +0400
>+++ /usr/ports/net-mgmt/nfdump/distinfo	2010-12-30 22:07:40.451994960 +0300
>@@ -1,3 +1,2 @@
>-MD5 (nfdump-1.6.1.tar.gz) = 02646022b2ae01131cb1fd5231393a8a
>-SHA256 (nfdump-1.6.1.tar.gz) = d0585d3963288b708f2be6081f673d9935acc8bb5f25255286786eedf31edafd
>-SIZE (nfdump-1.6.1.tar.gz) = 495643
>+SHA256 (nfdump-1.6.2.tar.gz) = c69bbb5fb401161e5e20b848b47eff4a280d5c8d5f2c7f0943ea0b821b5742b0
>+SIZE (nfdump-1.6.2.tar.gz) = 469358
>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	2010-01-23 04:11:38.000000000 +0300
>+++ /usr/ports/net-mgmt/nfdump/files/patch-bin_ft2nfdump.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,14 +0,0 @@
>-
>-$FreeBSD: ports/net-mgmt/nfdump/files/patch-bin_ft2nfdump.c,v 1.1 2010/01/23 01:11:38 wen Exp $
>-
>---- 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	2010-01-23 04:11:38.000000000 +0300
>+++ /usr/ports/net-mgmt/nfdump/files/patch-configure	1970-01-01 03:00:00.000000000 +0300
>@@ -1,23 +0,0 @@
>-
>-$FreeBSD: ports/net-mgmt/nfdump/files/patch-configure,v 1.2 2010/01/23 01:11:38 wen Exp $
>-
>---- configure.orig
>-+++ configure
>-@@ -4011,7 +4011,7 @@
>- fi
>- 
>- if test -d "$WHERE_FTPATH"; then
>--	if test ! -f "$WHERE_FTPATH/lib/ftlib.h"; then
>-+	if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then
>- 		{ { 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; }; }
>-@@ -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
>--	FT_INCLUDES="-I$WHERE_FTPATH/src -I$WHERE_FTPATH/lib"
>-+	FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib"
>- 	FT_LDFLAGS="-L$WHERE_FTPATH/lib"
>- else
>- 	{ { echo "$as_me:$LINENO: error: flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH" >&5

Actions: View | Diff

Attachments on bug 153608: 112236