diff options
author | Anders Nordby <anders@FreeBSD.org> | 2005-06-15 20:14:59 +0000 |
---|---|---|
committer | Anders Nordby <anders@FreeBSD.org> | 2005-06-15 20:14:59 +0000 |
commit | 888700f56f55ea2d368e73ec9ff1e6adf400112f (patch) | |
tree | 937ff6fae5922793d506bba620bbee0674513167 | |
parent | . Update to 2.0.2. (diff) |
Update to 0.68.
Sponsored by: University of Tromsø & University of Bergen
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=137503
-rw-r--r-- | net-mgmt/flow-tools/Makefile | 4 | ||||
-rw-r--r-- | net-mgmt/flow-tools/distinfo | 4 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-configs_Makefile | 16 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-configure.in | 6 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-src_flow-cat.c | 16 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-src_flow-dscan.c | 27 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-src_flow-fanout.c | 16 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-src_flow-receive.c | 16 | ||||
-rw-r--r-- | net-mgmt/flow-tools/pkg-plist | 3 |
9 files changed, 23 insertions, 85 deletions
diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile index 73e23e07062c..f22bd99158d6 100644 --- a/net-mgmt/flow-tools/Makefile +++ b/net-mgmt/flow-tools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= flow-tools -PORTVERSION= 0.67 +PORTVERSION= 0.68 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ @@ -23,7 +23,7 @@ MAN1= flow-capture.1 flow-cat.1 flow-dscan.1 flow-expire.1 \ flow-nfilter.1 flow-print.1 flow-receive.1 \ flow-report.1 flow-send.1 flow-split.1 flow-stat.1 \ flow-tag.1 flow-tools.1 flow-tools-examples.1 \ - flow-xlate.1 + flow-xlate.1 flow-rptfmt.1 flow-log2rrd.1 flow-rpt2rrd.1 post-patch: ${TOUCH} -r ${WRKSRC}/configure.in.orig ${WRKSRC}/configure.in diff --git a/net-mgmt/flow-tools/distinfo b/net-mgmt/flow-tools/distinfo index 01d9eb3ee7f7..db3e6d0e8381 100644 --- a/net-mgmt/flow-tools/distinfo +++ b/net-mgmt/flow-tools/distinfo @@ -1,2 +1,2 @@ -MD5 (flow-tools-0.67.tar.gz) = 0ee0a2830effa554d1925236aad6b4fe -SIZE (flow-tools-0.67.tar.gz) = 983667 +MD5 (flow-tools-0.68.tar.gz) = c9e0a8b53c79611b6bffcb9d510a5a38 +SIZE (flow-tools-0.68.tar.gz) = 987151 diff --git a/net-mgmt/flow-tools/files/patch-configs_Makefile b/net-mgmt/flow-tools/files/patch-configs_Makefile index 2e03234af868..64d12317d489 100644 --- a/net-mgmt/flow-tools/files/patch-configs_Makefile +++ b/net-mgmt/flow-tools/files/patch-configs_Makefile @@ -1,5 +1,5 @@ ---- configs/Makefile.am.orig Mon Nov 24 23:01:37 2003 -+++ configs/Makefile.am Wed Jul 7 14:57:09 2004 +--- configs/Makefile.am.orig Tue Jun 7 22:43:47 2005 ++++ configs/Makefile.am Tue Jun 7 22:44:44 2005 @@ -1,6 +1,6 @@ -ftsymdir=$(localstatedir)/sym +ftsymdir=$(localstatedir)/share/flow-tools @@ -9,12 +9,12 @@ +ftcfgdir=$(localstatedir)/etc/flow-tools ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg ---- configs/Makefile.in.orig Wed Dec 3 22:20:08 2003 -+++ configs/Makefile.in Wed Jul 7 14:58:41 2004 -@@ -117,10 +117,10 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- configs/Makefile.in.orig Tue Jun 7 22:44:14 2005 ++++ configs/Makefile.in Tue Jun 7 22:45:10 2005 +@@ -88,10 +88,10 @@ + am__include = @am__include@ + am__quote = @am__quote@ + install_sh = @install_sh@ -ftsymdir = $(localstatedir)/sym +ftsymdir = $(localstatedir)/share/flow-tools ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym diff --git a/net-mgmt/flow-tools/files/patch-configure.in b/net-mgmt/flow-tools/files/patch-configure.in index 0947d6530cc4..0c1b20b87bf8 100644 --- a/net-mgmt/flow-tools/files/patch-configure.in +++ b/net-mgmt/flow-tools/files/patch-configure.in @@ -1,7 +1,7 @@ ---- configure.in.orig Wed Dec 3 22:18:15 2003 -+++ configure.in Wed Jul 7 15:03:57 2004 +--- configure.in.orig Tue Jun 7 22:41:51 2005 ++++ configure.in Tue Jun 7 22:42:25 2005 @@ -6,7 +6,7 @@ - AM_INIT_AUTOMAKE(flow-tools, 0.67) + AM_INIT_AUTOMAKE(flow-tools, 0.68) AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in) -CFLAGS="-g -Wall" diff --git a/net-mgmt/flow-tools/files/patch-src_flow-cat.c b/net-mgmt/flow-tools/files/patch-src_flow-cat.c deleted file mode 100644 index 47711b52149d..000000000000 --- a/net-mgmt/flow-tools/files/patch-src_flow-cat.c +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- src/flow-cat.c.orig Tue Aug 24 10:39:54 2004 -+++ src/flow-cat.c Tue Aug 24 10:40:09 2004 -@@ -551,8 +551,8 @@ - break; - - next_file: -- -- } /* FOREACH filename in dir */ -+ ; -+ } /* FOREACH filename in dir */ - - } /* foreach dir bundle */ - diff --git a/net-mgmt/flow-tools/files/patch-src_flow-dscan.c b/net-mgmt/flow-tools/files/patch-src_flow-dscan.c deleted file mode 100644 index 433d817c1a92..000000000000 --- a/net-mgmt/flow-tools/files/patch-src_flow-dscan.c +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- src/flow-dscan.c.orig Tue Aug 24 10:40:32 2004 -+++ src/flow-dscan.c Tue Aug 24 10:41:01 2004 -@@ -561,8 +561,9 @@ - - skip2: - -+ ; - -- } /* while rec */ -+ } /* while rec */ - - if (debug > 0) { - ftprof_end(&ftp, ftio_get_rec_total(&ftio)); -@@ -806,8 +807,8 @@ - fterr_info("ager: reset hash run"); - - skip3: -- --} /* ager */ -+ ; -+ } /* ager */ - - int load_suppress(struct dscan_state *ds, int sd) - { diff --git a/net-mgmt/flow-tools/files/patch-src_flow-fanout.c b/net-mgmt/flow-tools/files/patch-src_flow-fanout.c index bf63629556c3..f9e6b6bdcd8a 100644 --- a/net-mgmt/flow-tools/files/patch-src_flow-fanout.c +++ b/net-mgmt/flow-tools/files/patch-src_flow-fanout.c @@ -1,16 +1,10 @@ - -$FreeBSD$ - ---- src/flow-fanout.c.orig Tue Aug 24 10:42:14 2004 -+++ src/flow-fanout.c Tue Aug 24 10:42:26 2004 -@@ -840,8 +840,8 @@ - } /* fte.buf_size */ - +--- src/flow-fanout.c.orig Tue Jun 7 22:52:16 2005 ++++ src/flow-fanout.c Tue Jun 7 22:52:39 2005 +@@ -855,6 +855,7 @@ + } /* if FD_ISSET */ + skip1: -- -- } /* if FD_ISSET */ + ; -+ } /* if FD_ISSET */ if (sig_quit_flag) { fterr_info("SIGQUIT"); diff --git a/net-mgmt/flow-tools/files/patch-src_flow-receive.c b/net-mgmt/flow-tools/files/patch-src_flow-receive.c deleted file mode 100644 index ae78b0d898b8..000000000000 --- a/net-mgmt/flow-tools/files/patch-src_flow-receive.c +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- src/flow-receive.c.orig Tue Aug 24 10:41:43 2004 -+++ src/flow-receive.c Tue Aug 24 10:41:55 2004 -@@ -733,8 +733,8 @@ - } /* for */ - - skip1: -- -- } /* if FD_ISSET */ -+ ; -+ } /* if FD_ISSET */ - - } /* while 1 */ - diff --git a/net-mgmt/flow-tools/pkg-plist b/net-mgmt/flow-tools/pkg-plist index d6e1bb685b2c..8dc3a708299a 100644 --- a/net-mgmt/flow-tools/pkg-plist +++ b/net-mgmt/flow-tools/pkg-plist @@ -8,12 +8,15 @@ bin/flow-filter bin/flow-gen bin/flow-header bin/flow-import +bin/flow-log2rrd bin/flow-mask bin/flow-merge bin/flow-nfilter bin/flow-print bin/flow-receive bin/flow-report +bin/flow-rpt2rrd +bin/flow-rptfmt bin/flow-send bin/flow-split bin/flow-stat |