From 997b6465c4144a9d7a2bac380b709beb69f104e0 Mon Sep 17 00:00:00 2001 From: Bill Fumerola Date: Fri, 4 Apr 2003 04:07:16 +0000 Subject: upgrade to 0.66, takeover maintainership Approved by: maintainer --- net-mgmt/flow-tools/Makefile | 15 +++-- net-mgmt/flow-tools/distinfo | 2 +- net-mgmt/flow-tools/files/patch-Makefile | 19 ------ net-mgmt/flow-tools/files/patch-configs_Makefile | 24 ++++---- net-mgmt/flow-tools/files/patch-configure | 25 ++++---- net-mgmt/flow-tools/files/patch-ftpaths.h | 73 +++++++++++++++++------- net-mgmt/flow-tools/pkg-plist | 16 ++++-- 7 files changed, 92 insertions(+), 82 deletions(-) delete mode 100644 net-mgmt/flow-tools/files/patch-Makefile (limited to 'net-mgmt/flow-tools') diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile index 12daa088684c..19459c80ce49 100644 --- a/net-mgmt/flow-tools/Makefile +++ b/net-mgmt/flow-tools/Makefile @@ -6,11 +6,11 @@ # PORTNAME= flow-tools -PORTVERSION= 0.62 +PORTVERSION= 0.66 CATEGORIES= net MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ -MAINTAINER= .@babolo.ru +MAINTAINER= billf@FreeBSD.org COMMENT= Programs to work with Cisco NetFlow USE_REINPLACE= yes @@ -19,15 +19,14 @@ CONFIGURE_ARGS+=--localstatedir=${PREFIX} MAN1= flow-capture.1 flow-cat.1 flow-dscan.1 flow-expire.1 \ flow-export.1 flow-fanout.1 flow-filter.1 flow-gen.1 \ - flow-header.1 flow-import.1 flow-merge.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-header.1 flow-import.1 flow-mask.1 flow-merge.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 post-patch: ${TOUCH} -r ${WRKSRC}/configure.in.orig ${WRKSRC}/configure.in - ${TOUCH} -r ${WRKSRC}/configure.orig ${WRKSRC}/configure - ${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am ${REINPLACE_CMD}\ -e 's|@localstatedir@/sym/|${PREFIX}/share/flow-tools/|' \ -e 's|@localstatedir@/cfg/|${PREFIX}/etc/flow-tools/|' \ diff --git a/net-mgmt/flow-tools/distinfo b/net-mgmt/flow-tools/distinfo index ea4567b8d1cc..c1096dddffc4 100644 --- a/net-mgmt/flow-tools/distinfo +++ b/net-mgmt/flow-tools/distinfo @@ -1 +1 @@ -MD5 (flow-tools-0.62.tar.gz) = 68ec3cd86903370c019f12593f437f78 +MD5 (flow-tools-0.66.tar.gz) = a32f02be71b29f0d4fe65c0d196d0093 diff --git a/net-mgmt/flow-tools/files/patch-Makefile b/net-mgmt/flow-tools/files/patch-Makefile deleted file mode 100644 index c911be279ee0..000000000000 --- a/net-mgmt/flow-tools/files/patch-Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.am Thu Aug 8 09:32:32 2002 -+++ Makefile.am Sun Aug 25 02:32:20 2002 -@@ -1,4 +1,4 @@ --SUBDIRS = lib src docs configs bin -+SUBDIRS = lib src docs configs - - EXTRA_DIST = bin/flow-mirror bin/flow-rsync bin/flow-search utils/* \ - SECURITY contrib/* configs/* ---- Makefile.in Fri Aug 9 05:06:16 2002 -+++ Makefile.in Sun Aug 25 02:44:57 2002 -@@ -81,7 +81,7 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ --SUBDIRS = lib src docs configs bin -+SUBDIRS = lib src docs configs - - EXTRA_DIST = bin/flow-mirror bin/flow-rsync bin/flow-search utils/* \ - SECURITY contrib/* configs/* diff --git a/net-mgmt/flow-tools/files/patch-configs_Makefile b/net-mgmt/flow-tools/files/patch-configs_Makefile index 2d81ad21d879..74b70bc6dadb 100644 --- a/net-mgmt/flow-tools/files/patch-configs_Makefile +++ b/net-mgmt/flow-tools/files/patch-configs_Makefile @@ -1,26 +1,26 @@ ---- configs/Makefile.am Fri Jul 6 06:28:57 2001 -+++ configs/Makefile.am Sat Jan 12 06:20:07 2002 +--- configs/Makefile.am 2003/04/03 18:24:08 ++++ configs/Makefile.am 2003/04/03 18:42:23 @@ -1,6 +1,6 @@ -ftsymdir=$(localstatedir)/sym +ftsymdir=$(localstatedir)/share/flow-tools - ftsym_DATA = asn ip-prot tcp-port + ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym -ftcfgdir=$(localstatedir)/cfg +ftcfgdir=$(localstatedir)/etc/flow-tools - ftcfg_DATA = map filter-acl + ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg ---- configs/Makefile.in Fri Aug 9 05:06:41 2002 -+++ configs/Makefile.in Sat Jan 12 08:04:39 2002 -@@ -81,10 +81,10 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ +--- configs/Makefile.in 2003/04/03 18:24:08 ++++ configs/Makefile.in 2003/04/03 18:38:09 +@@ -114,10 +114,10 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -ftsymdir = $(localstatedir)/sym +ftsymdir = $(localstatedir)/share/flow-tools - ftsym_DATA = asn ip-prot tcp-port + ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym -ftcfgdir = $(localstatedir)/cfg +ftcfgdir = $(localstatedir)/etc/flow-tools - ftcfg_DATA = map filter-acl + ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.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 e42e912a5f9b..40f9f64fcad3 100644 --- a/net-mgmt/flow-tools/files/patch-configure +++ b/net-mgmt/flow-tools/files/patch-configure @@ -1,7 +1,13 @@ ---- configure.in.orig Wed Oct 16 01:28:23 2002 -+++ configure.in Sun Nov 17 05:14:42 2002 -@@ -6,7 +6,7 @@ - AM_INIT_AUTOMAKE(flow-tools, 0.62) +--- 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) AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in) -CFLAGS="-g -Wall" @@ -9,14 +15,3 @@ dnl Checks for programs. AC_PROG_CC ---- configure.orig Wed Oct 16 01:28:44 2002 -+++ configure Sun Nov 17 05:13:42 2002 -@@ -1583,7 +1583,7 @@ - - - --CFLAGS="-g -Wall" -+CFLAGS+="-g -Wall" - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' diff --git a/net-mgmt/flow-tools/files/patch-ftpaths.h b/net-mgmt/flow-tools/files/patch-ftpaths.h index 362bf3505a30..185e3325dd80 100644 --- a/net-mgmt/flow-tools/files/patch-ftpaths.h +++ b/net-mgmt/flow-tools/files/patch-ftpaths.h @@ -1,29 +1,58 @@ ---- lib/ftpaths.h.in Thu Aug 15 17:28:04 2002 -+++ lib/ftpaths.h.in Mon Apr 22 11:29:07 2002 +--- lib/ftpaths.h 2003/04/03 18:24:08 ++++ lib/ftpaths.h 2003/04/03 18:38:09 @@ -29,16 +29,16 @@ #ifndef FTPATHS_H #define FTPATHS_H --#define FT_PATH_CFG_MAP "@localstatedir@/cfg/map" --#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag" --#define FT_PATH_CFG_FILTER "@localstatedir@/cfg/filter" --#define FT_PATH_CFG_STAT "@localstatedir@/cfg/stat" -+#define FT_PATH_CFG_MAP "@localstatedir@/etc/flow-tools/map" -+#define FT_PATH_CFG_TAG "@localstatedir@/etc/flow-tools/tag" -+#define FT_PATH_CFG_FILTER "@localstatedir@/etc/flow-tools/filter" -+#define FT_PATH_CFG_STAT "@localstatedir@/etc/flow-tools/stat" +-#define FT_PATH_CFG_MAP "/usr/local/netflow/var/cfg/map.cfg" +-#define FT_PATH_CFG_TAG "/usr/local/netflow/var/cfg/tag.cfg" +-#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_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_SYM_IP_PROT "@localstatedir@/sym/ip-prot" --#define FT_PATH_SYM_IP_CLASS "@localstatedir@/sym/ip-class" --#define FT_PATH_SYM_IP_TYPE "@localstatedir@/sym/ip-type" --#define FT_PATH_SYM_TCP_PORT "@localstatedir@/sym/tcp-port" --#define FT_PATH_SYM_ASN "@localstatedir@/sym/asn" --#define FT_PATH_SYM_TAG "@localstatedir@/sym/tag" -+#define FT_PATH_SYM_IP_PROT "@localstatedir@/share/flow-tools/ip-prot" -+#define FT_PATH_SYM_IP_CLASS "@localstatedir@/share/flow-tools/ip-class" -+#define FT_PATH_SYM_IP_TYPE "@localstatedir@/share/flow-tools/ip-type" -+#define FT_PATH_SYM_TCP_PORT "@localstatedir@/share/flow-tools/tcp-port" -+#define FT_PATH_SYM_ASN "@localstatedir@/share/flow-tools/asn" -+#define FT_PATH_SYM_TAG "@localstatedir@/share/flow-tools/tag" +-#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" +-#define FT_PATH_SYM_TCP_PORT "/usr/local/netflow/var/sym/tcp-port.sym" +-#define FT_PATH_SYM_ASN "/usr/local/netflow/var/sym/asn.sym" +-#define FT_PATH_SYM_TAG "/usr/local/netflow/var/sym/tag.sym" ++#define FT_PATH_SYM_IP_PROT "/usr/local/share/flow-tools/ip-prot.sym" ++#define FT_PATH_SYM_IP_TYPE "/usr/local/share/flow-tools/ip-type.sym" ++#define FT_PATH_SYM_TCP_PORT "/usr/local/share/flow-tools/tcp-port.sym" ++#define FT_PATH_SYM_ASN "/usr/local/share/flow-tools/asn.sym" ++#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 @@ + #ifndef FTPATHS_H + #define FTPATHS_H + +-#define FT_PATH_CFG_MAP "@localstatedir@/cfg/map.cfg" +-#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag.cfg" +-#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_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_SYM_IP_PROT "@localstatedir@/sym/ip-prot.sym" +-#define FT_PATH_SYM_IP_TYPE "@localstatedir@/sym/ip-type.sym" +-#define FT_PATH_SYM_TCP_PORT "@localstatedir@/sym/tcp-port.sym" +-#define FT_PATH_SYM_ASN "@localstatedir@/sym/asn.sym" +-#define FT_PATH_SYM_TAG "@localstatedir@/sym/tag.sym" ++#define FT_PATH_SYM_IP_PROT "@localstatedir@/share/flow-tools/ip-prot.sym" ++#define FT_PATH_SYM_IP_TYPE "@localstatedir@/share/flow-tools/ip-type.sym" ++#define FT_PATH_SYM_TCP_PORT "@localstatedir@/share/flow-tools/tcp-port.sym" ++#define FT_PATH_SYM_ASN "@localstatedir@/share/flow-tools/asn.sym" ++#define FT_PATH_SYM_TAG "@localstatedir@/share/flow-tools/tag.sym" #endif /* FTPATHS_H */ diff --git a/net-mgmt/flow-tools/pkg-plist b/net-mgmt/flow-tools/pkg-plist index 87cb64f40b8c..8fb43449ad12 100644 --- a/net-mgmt/flow-tools/pkg-plist +++ b/net-mgmt/flow-tools/pkg-plist @@ -8,6 +8,7 @@ bin/flow-filter bin/flow-gen bin/flow-header bin/flow-import +bin/flow-mask bin/flow-merge bin/flow-nfilter bin/flow-print @@ -18,16 +19,21 @@ bin/flow-split bin/flow-stat bin/flow-tag bin/flow-xlate -etc/flow-tools/map -etc/flow-tools/filter-acl +etc/flow-tools/filter.cfg +etc/flow-tools/map.cfg +etc/flow-tools/mask.cfg +etc/flow-tools/stat.cfg +etc/flow-tools/tag.cfg include/ftconfig.h include/ftlib.h include/ftpaths.h include/ftqueue.h include/radix.h lib/libft.a -share/flow-tools/asn -share/flow-tools/ip-prot -share/flow-tools/tcp-port +share/flow-tools/asn.sym +share/flow-tools/ip-prot.sym +share/flow-tools/ip-type.sym +share/flow-tools/tag.sym +share/flow-tools/tcp-port.sym @dirrm etc/flow-tools @dirrm share/flow-tools -- cgit v1.2.3