14 files changed, 68 insertions, 160 deletions

diff --git a/net-mgmt/trafd/Makefile b/net-mgmt/trafd/Makefile
index 38ad451a07d1..ba797594d54a 100644
--- a/net-mgmt/trafd/Makefile
+++ b/net-mgmt/trafd/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	trafd
-PORTVERSION=	3.0.1
-PORTREVISION=	2
+PORTVERSION=	3.0.2.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.riss-telecom.ru/pub/dev/trafd/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	bms@FreeBSD.org
 COMMENT=	The BPF Traffic Collector
diff --git a/net-mgmt/trafd/distinfo b/net-mgmt/trafd/distinfo
index 98f3e20cbf5d..0535137e254f 100644
--- a/net-mgmt/trafd/distinfo
+++ b/net-mgmt/trafd/distinfo
@@ -1,3 +1,3 @@
-MD5 (trafd-3.0.1.tgz) = 6a5abb246e95b68f0d53ebf789bda4fb
-SHA256 (trafd-3.0.1.tgz) = 29164f69e6fcfeeefa6fe7f3bb07f415de03a45fa7985cfc76a99c423bc39db9
-SIZE (trafd-3.0.1.tgz) = 35365
+MD5 (trafd-3.0.2.1.tar.gz) = cf9aafae5373c842c476c314cbf514ea
+SHA256 (trafd-3.0.2.1.tar.gz) = 14438a8924498bce5b32f01c5f283ebec90394bb08f80c90f36ba082d2df6291
+SIZE (trafd-3.0.2.1.tar.gz) = 38278
diff --git a/net-mgmt/trafd/files/patch-Makefile.inc b/net-mgmt/trafd/files/patch-Makefile.inc
new file mode 100644
index 000000000000..c5e73a0dc114
--- /dev/null
+++ b/net-mgmt/trafd/files/patch-Makefile.inc
@@ -0,0 +1,17 @@
+--- Makefile.inc.orig	2009-04-21 09:52:03.000000000 +0100
++++ Makefile.inc	2009-04-21 09:54:50.000000000 +0100
+@@ -18,11 +18,11 @@
+ 
+ PREFIX?=/usr/local
+ BINDIR?=${PREFIX}/bin
+-MANDIR?=${PREFIX}/man/man1
+-SAVEDIR?=/var/trafd/
++MANDIR?=${MANPREFIX}/man1
++SAVEDIR?=${PREFIX}/var/trafd/
+ 
+ TRAFSTAT=${BINDIR}/trafstat
+-TRAFSTAT_LOG=/var/log/trafstat.log
++TRAFSTAT_LOG=${PREFIX}/var/log/trafstat.log
+ TRAFSTAT_PORT=150
+ 
+ TRAFLOG_FMT=${PREFIX}/etc/traflog.format
diff --git a/net-mgmt/trafd/files/patch-aa b/net-mgmt/trafd/files/patch-aa
deleted file mode 100644
index 250fb8c59302..000000000000
--- a/net-mgmt/trafd/files/patch-aa
+++ /dev/null
@@ -1,71 +0,0 @@
---- Makefile.orig	Thu Nov 25 03:38:29 1999
-+++ Makefile	Thu Feb 17 00:51:02 2000
-@@ -12,22 +12,22 @@
- #
- 
- # Target directory for install execution files.
--PATH_BINDIR=/usr/local/bin
-+PATH_BINDIR=${PREFIX}/bin
- 
- # Target directory for install man pages.
--PATH_MANDIR=/usr/local/man/man1
-+PATH_MANDIR=${MANPREFIX}/man1
- 
- # Trailing slash directory, summary traffic log files will be put there.
--PATH_TOSAVE=/var/trafd/
-+PATH_TOSAVE=${PREFIX}/var/trafd/
- 
- # Full pathname where locate tarfstat program.
--PATH_TRAFSTAT=/usr/local/bin/trafstat
-+PATH_TRAFSTAT=${PREFIX}/bin/trafstat
- 
- # Where locate trafstatd log file, if you want log then file must exist.
--PATH_TRAFSTAT_LOG=/var/log/trafstat.log
-+PATH_TRAFSTAT_LOG=${PREFIX}/var/log/trafstat.log
- 
- # File with user defined descriptions of the traflog output format.
--PATH_TRAFLOG_FMT=/usr/local/etc/traflog.format
-+PATH_TRAFLOG_FMT=${PREFIX}/etc/traflog.format
- 
- # Only group wheel can execute binary files.
- SHELL	= /bin/sh
-@@ -35,8 +35,8 @@
- GROUP	= wheel
- 
- # This options intended for BSD/OS V2.
--CC	= gcc
--FLAGS	= -O2
-+CC	?= gcc
-+#FLAGS	= -O2
- DEFINE	= -DRETSIGTYPE=void -DRETSIGVAL=
- #DEFINE += -DHAVE_FCNTL_H=1
- #DEFINE += -DHAVE_MEMORY_H=1
-@@ -45,7 +45,7 @@
- LDFLAGS	= -L../lib -lbpft -lpcap -lcurses -ltermcap -ll
- 
- INCLUDE	= -I../include
--CFLAGS	= ${FLAGS} ${INCLUDE} ${DEFINE} \
-+CFLAGS	+= ${INCLUDE} ${DEFINE} \
- 	-DPATH_TOSAVE=\"${PATH_TOSAVE}\"\
- 	-DPATH_TRAFSTAT=\"${PATH_TRAFSTAT}\"\
- 	-DPATH_TRAFSTAT_LOG=\"${PATH_TRAFSTAT_LOG}\"\
-@@ -69,10 +69,15 @@
- 	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafstop ${PATH_BINDIR}
- 	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafsave ${PATH_BINDIR}
- 	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafdump ${PATH_BINDIR}
--	install -s -o root -g ${GROUP} -m ${MODE} trafstat/trafstat ${PATH_BINDIR}
--	install -s -o root -g ${GROUP} -m ${MODE} trafstatd/trafstatd ${PATH_BINDIR}
--	install -s -o root -g ${GROUP} -m ${MODE} traflog/traflog ${PATH_BINDIR}
--	install -c -o root -g ${GROUP} -m ${MODE} traflog/traflog.format ${PATH_TRAFLOG_FMT}
-+	${BSD_INSTALL_PROGRAM} trafd/trafd ${PATH_BINDIR}
-+	${BSD_INSTALL_SCRIPT} trafd/trafstart ${PATH_BINDIR}
-+	${BSD_INSTALL_SCRIPT} trafd/trafstop ${PATH_BINDIR}
-+	${BSD_INSTALL_SCRIPT} trafd/trafsave ${PATH_BINDIR}
-+	${BSD_INSTALL_SCRIPT} trafd/trafdump ${PATH_BINDIR}
-+	${BSD_INSTALL_PROGRAM} trafstat/trafstat ${PATH_BINDIR}
-+	${BSD_INSTALL_PROGRAM} trafstatd/trafstatd ${PATH_BINDIR}
-+	${BSD_INSTALL_PROGRAM} traflog/traflog ${PATH_BINDIR}
-+	${BSD_INSTALL_SCRIPT} traflog/traflog.format ${PATH_TRAFLOG_FMT}
- 	@echo Done.
- 
- clean:
diff --git a/net-mgmt/trafd/files/patch-ab b/net-mgmt/trafd/files/patch-ab
deleted file mode 100644
index 37b96f3f6542..000000000000
--- a/net-mgmt/trafd/files/patch-ab
+++ /dev/null
@@ -1,7 +0,0 @@
---- trafd/trafdump.orig	Tue Feb  8 00:14:22 2000
-+++ trafd/trafdump	Tue Feb  8 00:15:05 2000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- #	trafdump	Copyright (c)1993 CAD lab
- #
diff --git a/net-mgmt/trafd/files/patch-ac b/net-mgmt/trafd/files/patch-ac
deleted file mode 100644
index 3bd0c67318ad..000000000000
--- a/net-mgmt/trafd/files/patch-ac
+++ /dev/null
@@ -1,7 +0,0 @@
---- trafd/trafsave.orig	Tue Feb  8 00:14:31 2000
-+++ trafd/trafsave	Tue Feb  8 00:15:15 2000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- #	trafsave	Copyright (c)1993 CAD lab
- #
diff --git a/net-mgmt/trafd/files/patch-ad b/net-mgmt/trafd/files/patch-ad
deleted file mode 100644
index d03435051373..000000000000
--- a/net-mgmt/trafd/files/patch-ad
+++ /dev/null
@@ -1,7 +0,0 @@
---- trafd/trafstart.orig	Tue Feb  8 00:14:42 2000
-+++ trafd/trafstart	Tue Feb  8 00:15:38 2000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- #	trafstart	Copyright (c)1993 CAD lab
- #
diff --git a/net-mgmt/trafd/files/patch-ae b/net-mgmt/trafd/files/patch-ae
deleted file mode 100644
index b583de35ce86..000000000000
--- a/net-mgmt/trafd/files/patch-ae
+++ /dev/null
@@ -1,7 +0,0 @@
---- trafd/trafstop.orig	Tue Feb  8 00:14:49 2000
-+++ trafd/trafstop	Tue Feb  8 00:15:51 2000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- #	trafstop	Copyright (c)1993 CAD lab
- #
diff --git a/net-mgmt/trafd/files/patch-ah b/net-mgmt/trafd/files/patch-ah
deleted file mode 100644
index 700118649959..000000000000
--- a/net-mgmt/trafd/files/patch-ah
+++ /dev/null
@@ -1,55 +0,0 @@
---- trafd/traffic.c.orig	Thu Nov 25 11:31:15 1999
-+++ trafd/traffic.c	Wed Dec 13 22:59:42 2006
-@@ -29,6 +29,7 @@
- 
- /*	traffic.c - collect network traffic	*/
- 
-+#include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
-@@ -69,7 +70,7 @@
- static int dlen;
- typedef struct t_entry *p_entry;
- static struct t_entry t;
--static struct timeval begin_time;
-+struct timeval begin_time;
- static u_char s_port_big[IPPORT_RESERVED];
- 
- /*
-@@ -214,7 +215,7 @@
- 		t.p_port = tp->th_sport, t.who_srv = 1;
- 	else if (tp->th_sport > tp->th_dport)
- 		t.p_port = tp->th_dport, t.who_srv = 2;
--	else if (tp->th_sport = tp->th_dport)
-+	else if (tp->th_sport == tp->th_dport)
- 		t.p_port = tp->th_sport, t.who_srv = 3;
- 	if (t.p_port > IPPORT_RESERVED) {
- 		if (s_port_big[tp->th_sport & (IPPORT_RESERVED-1)] & IPPROTO_TCP) {
-@@ -224,7 +225,7 @@
- 				t.p_port = tp->th_dport;
- 				t.who_srv = 2;
- 			}
--		if (tp->th_sport = tp->th_dport) t.who_srv = 3;
-+		if (tp->th_sport == tp->th_dport) t.who_srv = 3;
- 	}
- 	traf_add(insertentry(&t), t.n_bytes, t.n_psize);
- 
-@@ -261,7 +262,7 @@
- 		t.p_port = up->uh_sport, t.who_srv = 1;
- 	else if (up->uh_sport > up->uh_dport)
- 		t.p_port = up->uh_dport, t.who_srv = 2;
--	else if (up->uh_sport = up->uh_dport)
-+	else if (up->uh_sport == up->uh_dport)
- 		t.p_port = up->uh_sport, t.who_srv = 3;
- 	if (t.p_port > IPPORT_RESERVED) {
- 		if (s_port_big[up->uh_sport & (IPPORT_RESERVED-1)] & IPPROTO_UDP) {
-@@ -271,7 +272,7 @@
- 				t.p_port = up->uh_dport;
- 				t.who_srv = 2;
- 			}
--		if (up->uh_sport = up->uh_dport) t.who_srv = 3;
-+		if (up->uh_sport == up->uh_dport) t.who_srv = 3;
- 	}
- 	traf_add(insertentry(&t), t.n_bytes, t.n_psize);
- 
diff --git a/net-mgmt/trafd/files/patch-trafd__trafdump b/net-mgmt/trafd/files/patch-trafd__trafdump
new file mode 100644
index 000000000000..c7992e3d3f06
--- /dev/null
+++ b/net-mgmt/trafd/files/patch-trafd__trafdump
@@ -0,0 +1,7 @@
+--- trafd/trafdump.orig	2009-04-21 09:57:09.000000000 +0100
++++ trafd/trafdump	2009-04-21 09:39:52.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ #	trafdump	Copyright (c)1993 CAD lab
+ #
diff --git a/net-mgmt/trafd/files/patch-trafd__traffic.c b/net-mgmt/trafd/files/patch-trafd__traffic.c
new file mode 100644
index 000000000000..bacd614c9c2c
--- /dev/null
+++ b/net-mgmt/trafd/files/patch-trafd__traffic.c
@@ -0,0 +1,19 @@
+--- trafd/traffic.c.orig	2009-04-21 09:32:49.000000000 +0100
++++ trafd/traffic.c	2009-04-21 09:41:46.000000000 +0100
+@@ -32,6 +32,7 @@
+ 
+ /*	traffic.c - collect network traffic	*/
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -72,7 +73,7 @@
+ static int dlen;
+ typedef struct t_entry *p_entry;
+ static struct t_entry t;
+-static struct timeval begin_time;
++struct timeval begin_time;
+ static u_char s_port_big[IPPORT_RESERVED];
+ 
+ /*
diff --git a/net-mgmt/trafd/files/patch-trafd__trafsave b/net-mgmt/trafd/files/patch-trafd__trafsave
new file mode 100644
index 000000000000..a86b396ef583
--- /dev/null
+++ b/net-mgmt/trafd/files/patch-trafd__trafsave
@@ -0,0 +1,7 @@
+--- trafd/trafsave.orig	2009-04-21 09:39:40.000000000 +0100
++++ trafd/trafsave	2009-04-21 09:40:17.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ #	trafsave	Copyright (c)1993 CAD lab
+ #
diff --git a/net-mgmt/trafd/files/patch-trafd__trafstart b/net-mgmt/trafd/files/patch-trafd__trafstart
new file mode 100644
index 000000000000..bb7ee5b67b2b
--- /dev/null
+++ b/net-mgmt/trafd/files/patch-trafd__trafstart
@@ -0,0 +1,7 @@
+--- trafd/trafstart.orig	2009-04-21 09:39:40.000000000 +0100
++++ trafd/trafstart	2009-04-21 09:40:26.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ #	trafstart	Copyright (c)1993 CAD lab
+ #
diff --git a/net-mgmt/trafd/files/patch-trafd__trafstop b/net-mgmt/trafd/files/patch-trafd__trafstop
new file mode 100644
index 000000000000..3e099e92f183
--- /dev/null
+++ b/net-mgmt/trafd/files/patch-trafd__trafstop
@@ -0,0 +1,7 @@
+--- trafd/trafstop.orig	2009-04-21 09:39:40.000000000 +0100
++++ trafd/trafstop	2009-04-21 09:40:34.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ #	trafstop	Copyright (c)1993 CAD lab
+ #