head	1.5;
access;
symbols
	RELENG_8_4:1.5.0.2
	RELENG_9_1_0_RELEASE:1.4.2.1.4.2
	RELENG_9_1:1.4.2.1.0.4
	RELENG_9_1_BP:1.4.2.1
	RELENG_8_3_0_RELEASE:1.2.24.1.8.1
	RELENG_8_3:1.2.24.1.0.8
	RELENG_8_3_BP:1.2.24.1
	RELENG_9_0_0_RELEASE:1.4.2.1.2.1
	RELENG_9_0:1.4.2.1.0.2
	RELENG_9_0_BP:1.4.2.1
	RELENG_9:1.4.0.2
	RELENG_9_BP:1.4
	RELENG_7_4_0_RELEASE:1.2.28.1
	RELENG_8_2_0_RELEASE:1.2.24.1.6.1
	RELENG_7_4:1.2.0.28
	RELENG_7_4_BP:1.2
	RELENG_8_2:1.2.24.1.0.6
	RELENG_8_2_BP:1.2.24.1
	RELENG_8_1_0_RELEASE:1.2.24.1.4.1
	RELENG_8_1:1.2.24.1.0.4
	RELENG_8_1_BP:1.2.24.1
	RELENG_7_3_0_RELEASE:1.2.26.1
	RELENG_7_3:1.2.0.26
	RELENG_7_3_BP:1.2
	RELENG_8_0_0_RELEASE:1.2.24.1.2.1
	RELENG_8_0:1.2.24.1.0.2
	RELENG_8_0_BP:1.2.24.1
	RELENG_8:1.2.0.24
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.2.22.1
	RELENG_7_2:1.2.0.22
	RELENG_7_2_BP:1.2
	RELENG_7_1_0_RELEASE:1.2.20.1
	RELENG_6_4_0_RELEASE:1.2.18.1
	RELENG_7_1:1.2.0.20
	RELENG_7_1_BP:1.2
	RELENG_6_4:1.2.0.18
	RELENG_6_4_BP:1.2
	RELENG_7_0_0_RELEASE:1.2
	RELENG_6_3_0_RELEASE:1.2
	RELENG_7_0:1.2.0.16
	RELENG_7_0_BP:1.2
	RELENG_6_3:1.2.0.14
	RELENG_6_3_BP:1.2
	RELENG_7:1.2.0.12
	RELENG_7_BP:1.2
	RELENG_6_2_0_RELEASE:1.2
	RELENG_6_2:1.2.0.10
	RELENG_6_2_BP:1.2
	RELENG_5_5_0_RELEASE:1.2.2.1
	RELENG_5_5:1.2.2.1.0.4
	RELENG_5_5_BP:1.2.2.1
	RELENG_6_1_0_RELEASE:1.2
	RELENG_6_1:1.2.0.8
	RELENG_6_1_BP:1.2
	RELENG_6_0_0_RELEASE:1.2
	RELENG_6_0:1.2.0.6
	RELENG_6_0_BP:1.2
	RELENG_6:1.2.0.4
	RELENG_6_BP:1.2
	RELENG_5_4_0_RELEASE:1.2.2.1
	RELENG_5_4:1.2.2.1.0.2
	RELENG_5_4_BP:1.2.2.1
	RELENG_5:1.2.0.2;
locks; strict;
comment	@# @;


1.5
date	2012.11.17.01.54.45;	author svnexp;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2011.07.06.15.18.32;	author pluknet;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2011.07.05.14.50.06;	author glebius;	state Exp;
branches;
next	1.2;

1.2
date	2004.09.17.22.37.45;	author glebius;	state Exp;
branches
	1.2.2.1
	1.2.4.1
	1.2.12.1
	1.2.18.1
	1.2.20.1
	1.2.22.1
	1.2.24.1
	1.2.26.1
	1.2.28.1;
next	1.1;

1.1
date	2004.09.17.12.02.22;	author glebius;	state Exp;
branches;
next	;

1.5.2.1
date	2012.11.17.01.54.45;	author svnexp;	state dead;
branches;
next	1.5.2.2;

1.5.2.2
date	2013.03.28.13.06.16;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.4.2.1.2.1
	1.4.2.1.4.1;
next	1.4.2.2;

1.4.2.2
date	2012.11.17.11.37.44;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.4.2.1.2.2;

1.4.2.1.2.2
date	2012.11.17.08.37.40;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.4.2.1.4.2;

1.4.2.1.4.2
date	2012.11.17.08.48.32;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2004.11.10.19.31.37;	author glebius;	state Exp;
branches;
next	;

1.2.4.1
date	2012.11.17.07.46.17;	author svnexp;	state Exp;
branches;
next	;

1.2.12.1
date	2012.11.17.08.09.01;	author svnexp;	state Exp;
branches;
next	;

1.2.18.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.2.20.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.2.22.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.2.24.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.24.1.2.1
	1.2.24.1.4.1
	1.2.24.1.6.1
	1.2.24.1.8.1;
next	1.2.24.2;

1.2.24.2
date	2012.07.19.13.00.31;	author melifaro;	state Exp;
branches;
next	1.2.24.3;

1.2.24.3
date	2012.11.17.10.37.22;	author svnexp;	state Exp;
branches;
next	;

1.2.24.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.2.24.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.2.24.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.24.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.24.1.8.2;

1.2.24.1.8.2
date	2012.11.17.08.25.54;	author svnexp;	state Exp;
branches;
next	;

1.2.26.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.2.28.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.2.28.2;

1.2.28.2
date	2012.11.17.08.17.47;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Switching exporter and resync
@
text
@#
# $FreeBSD: head/usr.sbin/flowctl/Makefile 223824 2011-07-06 15:18:32Z pluknet $
#

.include <bsd.own.mk>
	
PROG=	flowctl
MAN=	flowctl.8

WARNS?= 2
DPADD=  ${LIBNETGRAPH}
LDADD=  -lnetgraph

.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
.endif
.if ${MK_INET_SUPPORT} != "no"
CFLAGS+= -DINET
.endif

.include <bsd.prog.mk>
@


1.5.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:16 +0000
@
text
@d1 21
@


1.5.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 21
#
# $FreeBSD: releng/8.4/usr.sbin/flowctl/Makefile 238620 2012-07-19 13:00:31Z melifaro $
#

.include <bsd.own.mk>
	
PROG=	flowctl
MAN=	flowctl.8

WARNS?= 2
DPADD=  ${LIBNETGRAPH}
LDADD=  -lnetgraph

.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
.endif
.if ${MK_INET_SUPPORT} != "no"
CFLAGS+= -DINET
.endif

.include <bsd.prog.mk>
@


1.4
log
@SVN rev 223824 on 2011-07-06 15:18:32Z by pluknet

Conditionally compile in the IPv4/IPv6 address family support.
Test it with feature_present(3), so that we do not end up with passing
an unsupported version to NgSendMsg(3).

Approved by:	glebius
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.4.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.4.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/usr.sbin/flowctl/Makefile 223824 2011-07-06 15:18:32Z pluknet $
@


1.4.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.4.2.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/usr.sbin/flowctl/Makefile 223824 2011-07-06 15:18:32Z pluknet $
@


1.4.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.4.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/usr.sbin/flowctl/Makefile 223824 2011-07-06 15:18:32Z pluknet $
@


1.3
log
@SVN rev 223788 on 2011-07-05 14:50:06Z by glebius

Rewrite the flowctl utility to add it support for displaying
both IPv4 and IPv4 flows.
@
text
@d17 3
a19 2

CFLAGS+= -I.
@


1.2
log
@Man page for flowctl utility.

mdoc(7) lessons by:	ru
Approved by:		julian (mentor)
@
text
@d5 2
d14 6
@


1.2.12.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/7/usr.sbin/flowctl/Makefile 135408 2004-09-17 22:37:45Z glebius $
@


1.2.4.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/6/usr.sbin/flowctl/Makefile 135408 2004-09-17 22:37:45Z glebius $
@


1.2.28.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.2.28.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/7.4/usr.sbin/flowctl/Makefile 135408 2004-09-17 22:37:45Z glebius $
@


1.2.26.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.2.24.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.2.24.2
log
@SVN rev 238620 on 2012-07-19 13:00:31Z by melifaro

MFC r223788, r223790, r223824 236808

Merge netflow v9 support (user side)

r223788 -  Rewrite the flowctl utility to add it support for displaying both IPv4 and IPv4 flows.
r223790 -  Update manual page. Mention IPv6 support, ..
r223824 - Conditionally compile in the IPv4/IPv6 address family support.
r236808 - Add "human" option to print IPv4/IPv6 flows in human-readable format.

Additionally, implement compatibility code for syntax changes introduced in r223788.
Flowctl supports specifying node both as absolute path (new style) and as node
name without colon (old style).

No objection from:  glebius
Approved by:        ae(mentor)
@
text
@a4 2
.include <bsd.own.mk>
	
a11 7
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
.endif
.if ${MK_INET_SUPPORT} != "no"
CFLAGS+= -DINET
.endif

@


1.2.24.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/usr.sbin/flowctl/Makefile 238620 2012-07-19 13:00:31Z melifaro $
@


1.2.24.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.24.1.8.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/usr.sbin/flowctl/Makefile 135408 2004-09-17 22:37:45Z glebius $
@


1.2.24.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.2.24.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.2.24.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.2.22.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.2.20.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2.18.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.2.2.1
log
@MFC:

  userland control utility for ng_netflow

Approved by:	julian (mentor)
@
text
@@


1.1
log
@Userland control utility for ng_netflow.

Approved by:	julian (mentor)
@
text
@d6 1
a6 1
MAN=
@

