update to 0.67

7 files changed, 26 insertions, 40 deletions

diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile
index 926145f08331..73e23e07062c 100644
--- a/net-mgmt/flow-tools/Makefile
+++ b/net-mgmt/flow-tools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	flow-tools
-PORTVERSION=	0.66
-PORTREVISION=	1
+PORTVERSION=	0.67
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.eng.oar.net/pub/flow-tools/
 
diff --git a/net-mgmt/flow-tools/distinfo b/net-mgmt/flow-tools/distinfo
index 85370ba83806..01d9eb3ee7f7 100644
--- a/net-mgmt/flow-tools/distinfo
+++ b/net-mgmt/flow-tools/distinfo
@@ -1,2 +1,2 @@
-MD5 (flow-tools-0.66.tar.gz) = a32f02be71b29f0d4fe65c0d196d0093
-SIZE (flow-tools-0.66.tar.gz) = 967711
+MD5 (flow-tools-0.67.tar.gz) = 0ee0a2830effa554d1925236aad6b4fe
+SIZE (flow-tools-0.67.tar.gz) = 983667
diff --git a/net-mgmt/flow-tools/files/patch-configs_Makefile b/net-mgmt/flow-tools/files/patch-configs_Makefile
index 74b70bc6dadb..2e03234af868 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	2003/04/03 18:24:08
-+++ configs/Makefile.am	2003/04/03 18:42:23
+--- configs/Makefile.am.orig	Mon Nov 24 23:01:37 2003
++++ configs/Makefile.am	Wed Jul  7 14:57:09 2004
 @@ -1,6 +1,6 @@
 -ftsymdir=$(localstatedir)/sym
 +ftsymdir=$(localstatedir)/share/flow-tools
@@ -7,11 +7,11 @@
  
 -ftcfgdir=$(localstatedir)/cfg
 +ftcfgdir=$(localstatedir)/etc/flow-tools
- ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg
+ ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
  
---- configs/Makefile.in	2003/04/03 18:24:08
-+++ configs/Makefile.in	2003/04/03 18:38:09
-@@ -114,10 +114,10 @@
+--- 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@
@@ -21,6 +21,6 @@
  
 -ftcfgdir = $(localstatedir)/cfg
 +ftcfgdir = $(localstatedir)/etc/flow-tools
- ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg
+ ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
  subdir = configs
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/net-mgmt/flow-tools/files/patch-configure b/net-mgmt/flow-tools/files/patch-configure
index 40f9f64fcad3..0947d6530cc4 100644
--- a/net-mgmt/flow-tools/files/patch-configure
+++ b/net-mgmt/flow-tools/files/patch-configure
@@ -1,17 +1,11 @@
---- configure.in	2003/04/03 19:46:23
-+++ configure.in	2003/04/03 19:51:51
-@@ -1,12 +1,12 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(lib/bit1024.c)
- 
--AC_PREFIX_DEFAULT(/usr/local/netflow)
-+AC_PREFIX_DEFAULT(/usr/local)
- 
- AM_INIT_AUTOMAKE(flow-tools, 0.66)
+--- configure.in.orig	Wed Dec  3 22:18:15 2003
++++ configure.in	Wed Jul  7 15:03:57 2004
+@@ -6,7 +6,7 @@
+ AM_INIT_AUTOMAKE(flow-tools, 0.67)
  AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in) 
  
 -CFLAGS="-g -Wall"
-+CFLAGS+="-g -Wall"
++dnl CFLAGS="-g -Wall"
  
  dnl Checks for programs.
  AC_PROG_CC
diff --git a/net-mgmt/flow-tools/files/patch-ftpaths.h b/net-mgmt/flow-tools/files/patch-ftpaths.h
index 185e3325dd80..1c9d6a9131c6 100644
--- a/net-mgmt/flow-tools/files/patch-ftpaths.h
+++ b/net-mgmt/flow-tools/files/patch-ftpaths.h
@@ -1,6 +1,6 @@
---- lib/ftpaths.h	2003/04/03 18:24:08
-+++ lib/ftpaths.h	2003/04/03 18:38:09
-@@ -29,16 +29,16 @@
+--- lib/ftpaths.h.orig	Wed Dec  3 22:19:47 2003
++++ lib/ftpaths.h	Wed Jul  7 15:06:42 2004
+@@ -29,17 +29,17 @@
  #ifndef FTPATHS_H
  #define FTPATHS_H
  
@@ -9,11 +9,13 @@
 -#define FT_PATH_CFG_FILTER          "/usr/local/netflow/var/cfg/filter.cfg"
 -#define FT_PATH_CFG_STAT            "/usr/local/netflow/var/cfg/stat.cfg"
 -#define FT_PATH_CFG_MASK            "/usr/local/netflow/var/cfg/mask.cfg"
+-#define FT_PATH_CFG_XLATE           "/usr/local/netflow/var/cfg/xlate.cfg"
 +#define FT_PATH_CFG_MAP             "/usr/local/etc/flow-tools/map.cfg"
 +#define FT_PATH_CFG_TAG             "/usr/local/etc/flow-tools/tag.cfg"
 +#define FT_PATH_CFG_FILTER          "/usr/local/etc/flow-tools/filter.cfg"
 +#define FT_PATH_CFG_STAT            "/usr/local/etc/flow-tools/stat.cfg"
 +#define FT_PATH_CFG_MASK            "/usr/local/etc/flow-tools/mask.cfg"
++#define FT_PATH_CFG_XLATE           "/usr/local/etc/flow-tools/xlate.cfg"
  
 -#define FT_PATH_SYM_IP_PROT         "/usr/local/netflow/var/sym/ip-prot.sym"
 -#define FT_PATH_SYM_IP_TYPE         "/usr/local/netflow/var/sym/ip-type.sym"
@@ -27,9 +29,9 @@
 +#define FT_PATH_SYM_TAG             "/usr/local/share/flow-tools/tag.sym"
  
  #endif /* FTPATHS_H */
---- lib/ftpaths.h.in	2003/04/03 18:24:08
-+++ lib/ftpaths.h.in	2003/04/03 18:38:09
-@@ -29,16 +29,16 @@
+--- lib/ftpaths.h.in.orig	Tue Nov 11 08:49:14 2003
++++ lib/ftpaths.h.in	Wed Jul  7 15:05:45 2004
+@@ -29,17 +29,17 @@
  #ifndef FTPATHS_H
  #define FTPATHS_H
  
@@ -38,11 +40,13 @@
 -#define FT_PATH_CFG_FILTER          "@localstatedir@/cfg/filter.cfg"
 -#define FT_PATH_CFG_STAT            "@localstatedir@/cfg/stat.cfg"
 -#define FT_PATH_CFG_MASK            "@localstatedir@/cfg/mask.cfg"
+-#define FT_PATH_CFG_XLATE           "@localstatedir@/cfg/xlate.cfg"
 +#define FT_PATH_CFG_MAP             "@localstatedir@/etc/flow-tools/map.cfg"
 +#define FT_PATH_CFG_TAG             "@localstatedir@/etc/flow-tools/tag.cfg"
 +#define FT_PATH_CFG_FILTER          "@localstatedir@/etc/flow-tools/filter.cfg"
 +#define FT_PATH_CFG_STAT            "@localstatedir@/etc/flow-tools/stat.cfg"
 +#define FT_PATH_CFG_MASK            "@localstatedir@/etc/flow-tools/mask.cfg"
++#define FT_PATH_CFG_XLATE           "@localstatedir@/etc/flow-tools/xlate.cfg"
  
 -#define FT_PATH_SYM_IP_PROT         "@localstatedir@/sym/ip-prot.sym"
 -#define FT_PATH_SYM_IP_TYPE         "@localstatedir@/sym/ip-type.sym"
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 7452e866df56..000000000000
--- a/net-mgmt/flow-tools/files/patch-src_flow-dscan_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_flow-dscan_c,v 1.1 2003/04/15 21:31:57 avsm Exp $
---- src/flow-dscan.c.orig	Tue Apr 15 19:53:40 2003
-+++ src/flow-dscan.c	Tue Apr 15 19:54:03 2003
-@@ -105,7 +105,7 @@ int main(int argc, char **argv)
-   struct dscan_dst *ddp, *ddp2;
-   struct dscan_sup *dsp_src, *dsp_dst;
-   u_long hash;
--  char fmt_buf1[64], fmt_buf2[64], fmt_buf3[64], fmt_buf4[54];
-+  char fmt_buf1[64], fmt_buf2[64], fmt_buf3[64], fmt_buf4[64];
-   int do_dump, do_load;
-   int filter_www, filter_mcast, filter_input, filter_output;
-   char in_tbl[65536], out_tbl[65536];
diff --git a/net-mgmt/flow-tools/pkg-plist b/net-mgmt/flow-tools/pkg-plist
index 8fb43449ad12..d6e1bb685b2c 100644
--- a/net-mgmt/flow-tools/pkg-plist
+++ b/net-mgmt/flow-tools/pkg-plist
@@ -24,6 +24,7 @@ etc/flow-tools/map.cfg
 etc/flow-tools/mask.cfg
 etc/flow-tools/stat.cfg
 etc/flow-tools/tag.cfg
+etc/flow-tools/xlate.cfg
 include/ftconfig.h
 include/ftlib.h
 include/ftpaths.h