Attachment #72050 for bug #104811

View | Details | Raw Unified | Return to bug 104811
Collapse All | Expand All




#

PORTNAME=	nfdump
PORTVERSION=	1.5.2
CATEGORIES=	net-mgmt
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}


GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}

#flow-tools support
OPTIONS=	FT2NFDUMP	"With Flow-tools to nfdump converter" off \
		SFLOW		"Build sflow collector daemon also" off

.include <bsd.port.pre.mk>

#for compatibility
#
.ifndef(WITHOUT_NFDUMP14_SUPPORT)
CONFIGURE_ARGS=		--enable-compat14
.endif
#flow-tools support
OPTIONS=	FT2NFDUMP	"With Flow-tools to nfdump converter" off

.include <bsd.port.pre.mk>

PLIST_FILES=	bin/nfcapd bin/nfdump bin/nfprofile bin/nfreplay bin/nfclean.pl
MAN1=		nfcapd.1 nfdump.1 nfprofile.1 nfreplay.1

CONFIGURE_ARGS+=	--enable-ftconv --with-ftpath=${LOCALBASE}
PLIST_FILES+=	bin/ft2nfdump
MAN1+=		ft2nfdump.1
.endif

#sflow capture support
.if defined(WITH_SFLOW)
CONFIGURE_ARGS+=	--enable-sflow
PLIST_FILES+=	bin/sfcapd
MAN1+=		sfcapd.1
.endif

.if !defined(NOPORTDOCS)

Lines 1-3 Link Here

(-)/usr/ports/net-mgmt/nfdump/distinfo (-3 / +3 lines)
1	MD5 (nfdump-1.5.tar.gz) = 47a823b88210d979ad36a55bc4eebcae	1	MD5 (nfdump-1.5.2.tar.gz) = 4447c3338cc7eae6eee5288889f27d28
2	SHA256 (nfdump-1.5.tar.gz) = d1c70b0f7340d1c1bdc016132310a7656f085d3c84f20eb9a6eff646344fb48d	2	SHA256 (nfdump-1.5.2.tar.gz) = d86d5ce09a67913fba93ca19321d1c20edcbbd4139b2b87d79b663d983dd1ee5
3	SIZE (nfdump-1.5.tar.gz) = 187689	3	SIZE (nfdump-1.5.2.tar.gz) = 224287





$FreeBSD$

--- Makefile.in.orig
+++ Makefile.in
@@ -100,11 +100,11 @@
 	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;
-	$(INSTALL) -o root -g bin -m 755 nfprofile $(PREFIX)/bin
-	$(INSTALL) -o root -g bin -m 755 nfreplay $(PREFIX)/bin
-	test -f $(PREFIX)/bin/nfclean.pl || $(INSTALL) -o root -g bin -m 755 nfclean.pl $(PREFIX)/bin
+	test -f $(PREFIX)/bin/nfclean.pl || $(BSD_INSTALL_SCRIPT) nfclean.pl $(PREFIX)/bin
+	$(BSD_INSTALL_PROGRAM) nfdump $(PREFIX)/bin 
+	$(BSD_INSTALL_PROGRAM) nfprofile $(PREFIX)/bin
+	$(BSD_INSTALL_PROGRAM) nfreplay $(PREFIX)/bin
+	$(BSD_INSTALL_SCRIPT) nfclean.pl $(PREFIX)/bin
 
-	$(INSTALL) -o root -g bin -m 644 nfcapd.1 $(MANDIR)/man1
-	$(INSTALL) -o root -g bin -m 644 nfdump.1 $(MANDIR)/man1
-	$(INSTALL) -o root -g bin -m 644 nfprofile.1 $(MANDIR)/man1
-	$(INSTALL) -o root -g bin -m 644 nfreplay.1 $(MANDIR)/man1
+	$(BSD_INSTALL_MAN) nfcapd.1 $(MANDIR)/man1
+	$(BSD_INSTALL_MAN) nfdump.1 $(MANDIR)/man1
+	$(BSD_INSTALL_MAN) nfprofile.1 $(MANDIR)/man1
+	$(BSD_INSTALL_MAN) nfreplay.1 $(MANDIR)/man1
 	if test -f ft2nfdump; then \
-		$(INSTALL) -o root -g bin -m 755 ft2nfdump $(PREFIX)/bin;   \
-		$(INSTALL) -o root -g bin -m 644 ft2nfdump.1 $(MANDIR)/man1;    \
+		$(BSD_INSTALL_PROGRAM) ft2nfdump $(PREFIX)/bin;   \
+		$(BSD_INSTALL_MAN) ft2nfdump.1 $(MANDIR)/man1;    \
 	fi;
 
 uninstall:
 	for file in $(OBJECTS); do \





$FreeBSD$

--- ft2nfdump.c.orig
+++ ft2nfdump.c
@@ -64,7 +64,7 @@
 #endif
 
 #include "version.h"
 #include <errno.h>
-#include "ftbuild.h"
+/*#include "ftbuild.h"*/
 #include "nf_common.h"
 #include "nffile.h"
 #include "launch.h"

Return to bug 104811

Lines 6-12 Link Here

(-)/usr/ports/net-mgmt/nfdump/Makefile (-5 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= nfdump	8	PORTNAME= nfdump
9	PORTVERSION= 1.5	9	PORTVERSION= 1.5.2
10	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 16-30 Link Here
16		16
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	18	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
		19
		20	#flow-tools support
		21	OPTIONS= FT2NFDUMP "With Flow-tools to nfdump converter" off \
		22	SFLOW "Build sflow collector daemon also" off
		23
		24	.include <bsd.port.pre.mk>
		25
19	#for compatibility	26	#for compatibility
20	#	27	#
21	.ifndef(WITHOUT_NFDUMP14_SUPPORT)	28	.ifndef(WITHOUT_NFDUMP14_SUPPORT)
22	CONFIGURE_ARGS= --enable-compat14	29	CONFIGURE_ARGS= --enable-compat14
23	.endif	30	.endif
24	#flow-tools support
25	OPTIONS= FT2NFDUMP "With Flow-tools to nfdump converter" off
26
27	.include <bsd.port.pre.mk>
28		31
29	PLIST_FILES= bin/nfcapd bin/nfdump bin/nfprofile bin/nfreplay bin/nfclean.pl	32	PLIST_FILES= bin/nfcapd bin/nfdump bin/nfprofile bin/nfreplay bin/nfclean.pl
30	MAN1= nfcapd.1 nfdump.1 nfprofile.1 nfreplay.1	33	MAN1= nfcapd.1 nfdump.1 nfprofile.1 nfreplay.1
Lines 36-41 Link Here
36	CONFIGURE_ARGS+= --enable-ftconv --with-ftpath=${LOCALBASE}	39	CONFIGURE_ARGS+= --enable-ftconv --with-ftpath=${LOCALBASE}
37	PLIST_FILES+= bin/ft2nfdump	40	PLIST_FILES+= bin/ft2nfdump
38	MAN1+= ft2nfdump.1	41	MAN1+= ft2nfdump.1
		42	.endif
		43
		44	#sflow capture support
		45	.if defined(WITH_SFLOW)
		46	CONFIGURE_ARGS+= --enable-sflow
		47	PLIST_FILES+= bin/sfcapd
		48	MAN1+= sfcapd.1
39	.endif	49	.endif
40		50
41	.if !defined(NOPORTDOCS)	51	.if !defined(NOPORTDOCS)

Lines 1-40 Link Here

(-)/usr/ports/net-mgmt/nfdump/files/patch-Makefile.in (-33 / +13 lines)
1		1
2	$FreeBSD: ports/net-mgmt/nfdump/files/patch-Makefile.in,v 1.5 2006/04/01 22:57:30 pav Exp $	2	$FreeBSD$
3		3
4	--- Makefile.in.orig	4	--- Makefile.in.orig
5	+++ Makefile.in	5	+++ Makefile.in
6	@@ -90,23 +90,19 @@	6	@@ -100,11 +100,11 @@
7	$(CC) $(CFLAGS) -o $@ $(FT2NF_OBJ) $(FT_LDFLAGS) $(FT_LIBS)	7	test -d $(MANDIR)/man1 \|\| install -d -o root -g bin -m 755 $(MANDIR)/man1
8		8	for file in $(OBJECTS); do \
9	install: $(OBJECTS)	9	if [ -f $$file.1 ]; then \
10	- test -d $(PREFIX) \|\| install -d -o root -g bin -m 755 $(PREFIX)	10	- $(INSTALL) -o root -g bin -m 755 $$file $(PREFIX)/bin ; \
11	- test -d $(PREFIX)/bin \|\| install -d -o root -g bin -m 755 $(PREFIX)/bin	11	- $(INSTALL) -o root -g bin -m 644 $$file.1 $(MANDIR)/man1 ; \
12	- test -d $(MANDIR) \|\| install -d -o root -g bin -m 755 $(MANDIR)	12	+ $(BSD_INSTALL_PROGRAM) $$file $(PREFIX)/bin ; \
13	- test -d $(MANDIR)/man1 \|\| install -d -o root -g bin -m 755 $(MANDIR)/man1	13	+ $(BSD_INSTALL_MAN) $$file.1 $(MANDIR)/man1 ; \
14	- $(INSTALL) -o root -g bin -m 755 nfcapd $(PREFIX)/bin	14	fi \
15	- $(INSTALL) -o root -g bin -m 755 nfdump $(PREFIX)/bin	15	done;
16	- $(INSTALL) -o root -g bin -m 755 nfprofile $(PREFIX)/bin
17	- $(INSTALL) -o root -g bin -m 755 nfreplay $(PREFIX)/bin
18	- test -f $(PREFIX)/bin/nfclean.pl \|\| $(INSTALL) -o root -g bin -m 755 nfclean.pl $(PREFIX)/bin	16	- test -f $(PREFIX)/bin/nfclean.pl \|\| $(INSTALL) -o root -g bin -m 755 nfclean.pl $(PREFIX)/bin
19	+ $(BSD_INSTALL_PROGRAM) nfcapd $(PREFIX)/bin	17	+ test -f $(PREFIX)/bin/nfclean.pl \|\| $(BSD_INSTALL_SCRIPT) nfclean.pl $(PREFIX)/bin
20	+ $(BSD_INSTALL_PROGRAM) nfdump $(PREFIX)/bin
21	+ $(BSD_INSTALL_PROGRAM) nfprofile $(PREFIX)/bin
22	+ $(BSD_INSTALL_PROGRAM) nfreplay $(PREFIX)/bin
23	+ $(BSD_INSTALL_SCRIPT) nfclean.pl $(PREFIX)/bin
24
25	- $(INSTALL) -o root -g bin -m 644 nfcapd.1 $(MANDIR)/man1
26	- $(INSTALL) -o root -g bin -m 644 nfdump.1 $(MANDIR)/man1
27	- $(INSTALL) -o root -g bin -m 644 nfprofile.1 $(MANDIR)/man1
28	- $(INSTALL) -o root -g bin -m 644 nfreplay.1 $(MANDIR)/man1
29	+ $(BSD_INSTALL_MAN) nfcapd.1 $(MANDIR)/man1
30	+ $(BSD_INSTALL_MAN) nfdump.1 $(MANDIR)/man1
31	+ $(BSD_INSTALL_MAN) nfprofile.1 $(MANDIR)/man1
32	+ $(BSD_INSTALL_MAN) nfreplay.1 $(MANDIR)/man1
33	if test -f ft2nfdump; then \
34	- $(INSTALL) -o root -g bin -m 755 ft2nfdump $(PREFIX)/bin; \
35	- $(INSTALL) -o root -g bin -m 644 ft2nfdump.1 $(MANDIR)/man1; \
36	+ $(BSD_INSTALL_PROGRAM) ft2nfdump $(PREFIX)/bin; \
37	+ $(BSD_INSTALL_MAN) ft2nfdump.1 $(MANDIR)/man1; \
38	fi;
39		18
40	uninstall:	19	uninstall:
		20	for file in $(OBJECTS); do \