head	1.24;
access;
symbols
	RELENG_8_4:1.24.0.2
	RELENG_9_1_0_RELEASE:1.23.4.1.4.2
	RELENG_9_1:1.23.4.1.0.4
	RELENG_9_1_BP:1.23.4.1
	RELENG_8_3_0_RELEASE:1.23.2.1.8.1
	RELENG_8_3:1.23.2.1.0.8
	RELENG_8_3_BP:1.23.2.1
	RELENG_9_0_0_RELEASE:1.23.4.1.2.1
	RELENG_9_0:1.23.4.1.0.2
	RELENG_9_0_BP:1.23.4.1
	RELENG_9:1.23.0.4
	RELENG_9_BP:1.23
	RELENG_7_4_0_RELEASE:1.22.12.1
	RELENG_8_2_0_RELEASE:1.23.2.1.6.1
	RELENG_7_4:1.22.0.12
	RELENG_7_4_BP:1.22
	RELENG_8_2:1.23.2.1.0.6
	RELENG_8_2_BP:1.23.2.1
	RELENG_8_1_0_RELEASE:1.23.2.1.4.1
	RELENG_8_1:1.23.2.1.0.4
	RELENG_8_1_BP:1.23.2.1
	RELENG_7_3_0_RELEASE:1.22.10.1
	RELENG_7_3:1.22.0.10
	RELENG_7_3_BP:1.22
	RELENG_8_0_0_RELEASE:1.23.2.1.2.1
	RELENG_8_0:1.23.2.1.0.2
	RELENG_8_0_BP:1.23.2.1
	RELENG_8:1.23.0.2
	RELENG_8_BP:1.23
	RELENG_7_2_0_RELEASE:1.22.8.1
	RELENG_7_2:1.22.0.8
	RELENG_7_2_BP:1.22
	RELENG_7_1_0_RELEASE:1.22.6.1
	RELENG_6_4_0_RELEASE:1.14.8.2.4.1
	RELENG_7_1:1.22.0.6
	RELENG_7_1_BP:1.22
	RELENG_6_4:1.14.8.2.0.4
	RELENG_6_4_BP:1.14.8.2
	RELENG_7_0_0_RELEASE:1.22
	RELENG_6_3_0_RELEASE:1.14.8.2
	RELENG_7_0:1.22.0.4
	RELENG_7_0_BP:1.22
	RELENG_6_3:1.14.8.2.0.2
	RELENG_6_3_BP:1.14.8.2
	RELENG_7:1.22.0.2
	RELENG_7_BP:1.22
	RELENG_6_2_0_RELEASE:1.14.8.1
	RELENG_6_2:1.14.8.1.0.2
	RELENG_6_2_BP:1.14.8.1
	RELENG_5_5_0_RELEASE:1.14
	RELENG_5_5:1.14.0.14
	RELENG_5_5_BP:1.14
	RELENG_6_1_0_RELEASE:1.14
	RELENG_6_1:1.14.0.12
	RELENG_6_1_BP:1.14
	RELENG_6_0_0_RELEASE:1.14
	RELENG_6_0:1.14.0.10
	RELENG_6_0_BP:1.14
	RELENG_6:1.14.0.8
	RELENG_6_BP:1.14
	RELENG_5_4_0_RELEASE:1.14
	RELENG_5_4:1.14.0.6
	RELENG_5_4_BP:1.14
	RELENG_4_11_0_RELEASE:1.4.2.5
	RELENG_4_11:1.4.2.5.0.2
	RELENG_4_11_BP:1.4.2.5
	RELENG_5_3_0_RELEASE:1.14
	RELENG_5_3:1.14.0.4
	RELENG_5_3_BP:1.14
	RELENG_5:1.14.0.2
	RELENG_5_BP:1.14
	RELENG_4_10_0_RELEASE:1.4.2.4
	RELENG_4_10:1.4.2.4.0.2
	RELENG_4_10_BP:1.4.2.4
	RELENG_5_2_1_RELEASE:1.12
	RELENG_5_2_0_RELEASE:1.12
	RELENG_5_2:1.12.0.6
	RELENG_5_2_BP:1.12
	RELENG_4_9_0_RELEASE:1.4.2.3
	RELENG_4_9:1.4.2.3.0.8
	RELENG_4_9_BP:1.4.2.3
	RELENG_5_1_0_RELEASE:1.12
	RELENG_5_1:1.12.0.4
	RELENG_5_1_BP:1.12
	RELENG_4_8_0_RELEASE:1.4.2.3
	RELENG_4_8:1.4.2.3.0.6
	RELENG_4_8_BP:1.4.2.3
	RELENG_5_0_0_RELEASE:1.12
	RELENG_5_0:1.12.0.2
	RELENG_5_0_BP:1.12
	RELENG_4_7_0_RELEASE:1.4.2.3
	RELENG_4_7:1.4.2.3.0.4
	RELENG_4_7_BP:1.4.2.3
	RELENG_4_6_2_RELEASE:1.4.2.3
	RELENG_4_6_1_RELEASE:1.4.2.3
	RELENG_4_6_0_RELEASE:1.4.2.3
	RELENG_4_6:1.4.2.3.0.2
	RELENG_4_6_BP:1.4.2.3
	RELENG_4_5_0_RELEASE:1.4.2.2
	RELENG_4_5:1.4.2.2.0.4
	RELENG_4_5_BP:1.4.2.2
	RELENG_4_4_0_RELEASE:1.4.2.2
	RELENG_4_4:1.4.2.2.0.2
	RELENG_4_4_BP:1.4.2.2
	RELENG_4_3_0_RELEASE:1.4.2.1
	RELENG_4_3:1.4.2.1.0.2
	RELENG_4_3_BP:1.4.2.1
	RELENG_4_2_0_RELEASE:1.4
	RELENG_4_1_1_RELEASE:1.4
	PRE_SMPNG:1.5
	RELENG_4_1_0_RELEASE:1.4
	RELENG_3_5_0_RELEASE:1.3.2.2
	RELENG_4_0_0_RELEASE:1.4
	RELENG_4:1.4.0.2
	RELENG_4_BP:1.4
	RELENG_3_4_0_RELEASE:1.3.2.2
	NETGRAPH_MFC:1.4
	RELENG_3:1.3.0.2;
locks; strict;
comment	@# @;


1.24
date	2012.11.17.01.54.50;	author svnexp;	state Exp;
branches
	1.24.2.1;
next	1.23;

1.23
date	2008.03.29.17.44.40;	author ru;	state Exp;
branches
	1.23.2.1
	1.23.4.1;
next	1.22;

1.22
date	2007.10.09.23.31.11;	author obrien;	state Exp;
branches
	1.22.2.1
	1.22.6.1
	1.22.8.1
	1.22.10.1
	1.22.12.1;
next	1.21;

1.21
date	2007.10.09.13.42.34;	author obrien;	state Exp;
branches;
next	1.20;

1.20
date	2007.10.01.18.22.32;	author ru;	state Exp;
branches;
next	1.19;

1.19
date	2007.03.30.08.23.59;	author glebius;	state Exp;
branches;
next	1.18;

1.18
date	2007.03.28.14.04.35;	author glebius;	state Exp;
branches;
next	1.17;

1.17
date	2006.11.27.16.55.14;	author ru;	state Exp;
branches;
next	1.16;

1.16
date	2006.11.26.14.43.03;	author ru;	state Exp;
branches;
next	1.15;

1.15
date	2006.08.07.14.17.05;	author glebius;	state Exp;
branches;
next	1.14;

1.14
date	2004.01.26.10.27.18;	author ru;	state Exp;
branches
	1.14.8.1;
next	1.13;

1.13
date	2004.01.09.03.19.40;	author green;	state Exp;
branches;
next	1.12;

1.12
date	2002.01.22.22.01.25;	author archie;	state Exp;
branches;
next	1.11;

1.11
date	2001.07.20.06.20.03;	author obrien;	state Exp;
branches;
next	1.10;

1.10
date	2001.07.20.04.23.09;	author obrien;	state Exp;
branches;
next	1.9;

1.9
date	2001.03.26.14.41.01;	author ru;	state Exp;
branches;
next	1.8;

1.8
date	2001.03.20.18.16.51;	author ru;	state Exp;
branches;
next	1.7;

1.7
date	2001.03.17.08.59.31;	author phk;	state Exp;
branches;
next	1.6;

1.6
date	2001.03.16.19.35.07;	author phk;	state Exp;
branches;
next	1.5;

1.5
date	2000.07.03.13.34.18;	author phk;	state Exp;
branches;
next	1.4;

1.4
date	99.11.30.02.45.30;	author archie;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	99.10.28.20.17.12;	author archie;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	99.10.27.22.14.04;	author archie;	state Exp;
branches;
next	1.1;

1.1
date	99.10.21.09.06.06;	author julian;	state Exp;
branches;
next	;

1.24.2.1
date	2012.11.17.01.54.50;	author svnexp;	state dead;
branches;
next	1.24.2.2;

1.24.2.2
date	2013.03.28.13.06.20;	author svnexp;	state Exp;
branches;
next	;

1.23.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.23.2.1.2.1
	1.23.2.1.4.1
	1.23.2.1.6.1
	1.23.2.1.8.1;
next	1.23.2.2;

1.23.2.2
date	2012.11.17.10.37.24;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.23.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.23.2.1.8.2;

1.23.2.1.8.2
date	2012.11.17.08.25.56;	author svnexp;	state Exp;
branches;
next	;

1.23.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.23.4.1.2.1
	1.23.4.1.4.1;
next	1.23.4.2;

1.23.4.2
date	2012.11.17.11.37.45;	author svnexp;	state Exp;
branches;
next	;

1.23.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.23.4.1.2.2;

1.23.4.1.2.2
date	2012.11.17.08.37.42;	author svnexp;	state Exp;
branches;
next	;

1.23.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.23.4.1.4.2;

1.23.4.1.4.2
date	2012.11.17.08.48.34;	author svnexp;	state Exp;
branches;
next	;

1.22.2.1
date	2012.11.17.08.09.03;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.22.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.22.12.2;

1.22.12.2
date	2012.11.17.08.17.49;	author svnexp;	state Exp;
branches;
next	;

1.14.8.1
date	2006.08.10.11.11.49;	author glebius;	state Exp;
branches;
next	1.14.8.2;

1.14.8.2
date	2007.03.30.08.25.53;	author glebius;	state Exp;
branches
	1.14.8.2.4.1;
next	1.14.8.3;

1.14.8.3
date	2012.11.17.07.46.27;	author svnexp;	state Exp;
branches;
next	;

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

1.4.2.1
date	2001.01.09.06.52.25;	author phk;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	2001.04.25.12.10.21;	author ru;	state Exp;
branches;
next	1.4.2.3;

1.4.2.3
date	2002.02.01.18.17.43;	author archie;	state Exp;
branches;
next	1.4.2.4;

1.4.2.4
date	2004.02.23.11.23.11;	author ru;	state Exp;
branches;
next	1.4.2.5;

1.4.2.5
date	2004.08.20.14.34.44;	author ru;	state Exp;
branches;
next	1.4.2.6;

1.4.2.6
date	2012.11.17.07.28.24;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	99.11.17.07.23.13;	author julian;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	99.12.01.19.41.40;	author julian;	state Exp;
branches;
next	;


desc
@@


1.24
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.sbin/ngctl/Makefile 177714 2008-03-29 17:44:40Z ru $
# $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $

.include <bsd.own.mk>

PROG=	ngctl
MAN=	ngctl.8
SRCS=	main.c mkpeer.c config.c connect.c dot.c name.c show.c list.c \
	msg.c debug.c shutdown.c rmhook.c status.c types.c write.c
WARNS?=	3

.if defined(RELEASE_CRUNCH)
NGCTL_NO_LIBEDIT=
.endif

.if ${MK_LIBTHR} == "no"
NGCTL_NO_LIBEDIT=
.endif

DPADD=	${LIBNETGRAPH}
LDADD=	-lnetgraph

.if !defined(NGCTL_NO_LIBEDIT)
CFLAGS+= -DEDITLINE
DPADD+=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
LDADD+=	-lpthread -ledit -ltermcap
.endif

.include <bsd.prog.mk>
@


1.24.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:20 +0000
@
text
@d1 29
@


1.24.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 29
# $FreeBSD: releng/8.4/usr.sbin/ngctl/Makefile 177714 2008-03-29 17:44:40Z ru $
# $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $

.include <bsd.own.mk>

PROG=	ngctl
MAN=	ngctl.8
SRCS=	main.c mkpeer.c config.c connect.c dot.c name.c show.c list.c \
	msg.c debug.c shutdown.c rmhook.c status.c types.c write.c
WARNS?=	3

.if defined(RELEASE_CRUNCH)
NGCTL_NO_LIBEDIT=
.endif

.if ${MK_LIBTHR} == "no"
NGCTL_NO_LIBEDIT=
.endif

DPADD=	${LIBNETGRAPH}
LDADD=	-lnetgraph

.if !defined(NGCTL_NO_LIBEDIT)
CFLAGS+= -DEDITLINE
DPADD+=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
LDADD+=	-lpthread -ledit -ltermcap
.endif

.include <bsd.prog.mk>
@


1.23
log
@Remove options MK_LIBKSE and DEFAULT_THREAD_LIB now that we no longer
build libkse.  This should fix WITHOUT_LIBTHR builds as a side effect.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.23.4.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.23.4.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
@d1 1
a1 1
# $FreeBSD: stable/9/usr.sbin/ngctl/Makefile 177714 2008-03-29 17:44:40Z ru $
@


1.23.4.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.23.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.sbin/ngctl/Makefile 177714 2008-03-29 17:44:40Z ru $
@


1.23.4.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.23.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.sbin/ngctl/Makefile 177714 2008-03-29 17:44:40Z ru $
@


1.23.2.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.23.2.2
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
@d1 1
a1 1
# $FreeBSD: stable/8/usr.sbin/ngctl/Makefile 177714 2008-03-29 17:44:40Z ru $
@


1.23.2.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.23.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.sbin/ngctl/Makefile 177714 2008-03-29 17:44:40Z ru $
@


1.23.2.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.23.2.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.23.2.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.22
log
@Tweak the handling of "WITHOUT_LIBPTHREAD".  Also remove the accidental
treatment of 'LIBKSE' as an "old style" knob.

Submitted by:	ru
Approved by:	re(kensmith)
@
text
@d16 1
a16 1
.if ${MK_LIBTHR} == "no" && ${MK_LIBKSE} == "no"
@


1.22.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/ngctl/Makefile 172500 2007-10-09 23:31:11Z obrien $
@


1.22.12.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.22.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.sbin/ngctl/Makefile 172500 2007-10-09 23:31:11Z obrien $
@


1.22.10.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.22.8.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.22.6.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.21
log
@Repo copy libpthreads to libkse.
This introduces the WITHOUT_LIBKSE nob,
and changes WITHOUT_LIBPTHREADS to mean with neither threading libs.
Approved by:	re(kensmith)
@
text
@d16 1
a16 1
.if ${MK_LIBPTHREAD} == "no" && ${MK_LIBTHR} == "no" && ${MK_LIBKSE}
@


1.20
log
@Always install libpthread.* symlinks if at least one of
the threading libraries is built.  This simplifies the
logic in makefiles that need to check if the pthreads
support is present.  It also fixes a bug where we would
build a threading library that we shouldn't have built:
for example, building with WITHOUT_LIBTHR and the default
value of DEFAULT_THREADING_LIB (libthr) would mistakenly
build the libthr library, but not install it.

Approved by:	re (kensmith)
@
text
@d16 1
a16 1
.if ${MK_LIBTHR} == "no" && ${MK_LIBPTHREAD} == "no"
@


1.19
log
@The last change is not needed for HEAD.

Explained by:	ru
@
text
@d16 1
a16 2
.if ${MK_LIBTHR} == "no" && \
    (${MACHINE_ARCH} == "sparc64" || ${MK_LIBPTHREAD} == "no")
@


1.18
log
@Do not build the libedit support if NO_LIBPTHREAD is defined.

PR:		bin/104478
Submitted by:	Mike Durian <durian shadetreesoftware.com>
@
text
@d12 1
a12 1
.if defined(RELEASE_CRUNCH) || defined(NO_LIBPTHREAD)
@


1.17
log
@Push the detection of threading libs support down to ngctl/Makefile
as the latter can be built without threading (with the loss of line
editing functionality).

Pointed by:	glebius
@
text
@d12 1
a12 1
.if defined(RELEASE_CRUNCH)
@


1.16
log
@Fix "make checkdpadd".
@
text
@d4 2
d16 5
@


1.15
log
@Add line edit and history support to ngctl(8) via editline(3).

Details:
- The main thread runs editline(3) functions, that can block.
- A separate thread is launched to monitor netgraph sockets.
- The access to the descriptors is protected by a mutex. At
  runtime the monitoring thread owns the mutex. When the main
  thread reads a command from el_gets() it asks the monitoring
  thread to release a mutex and sleep until the main thread
  processes the command.

This makes ngctl(8) depend on libedit, and libpthread. Thus, the
new functionality isn't compiled in if release is being built
with -DRELEASE_CRUNCH.

PR:		bin/87352
Reviewed by:	ru, Nuno Antunes <nuno.antunes gmail.com>
@
text
@d20 1
a20 1
LDADD+=	-pthread -ledit -ltermcap
@


1.14
log
@Make this WARNS=3 clean.
@
text
@d9 5
d17 6
@


1.14.8.1
log
@MFC:
  Add line edit and history support to ngctl(8) via editline(3).

  Details:
  - The main thread runs editline(3) functions, that can block.
  - A separate thread is launched to monitor netgraph sockets.
  - The access to the descriptors is protected by a mutex. At
    runtime the monitoring thread owns the mutex. When the main
    thread reads a command from el_gets() it asks the monitoring
    thread to release a mutex and sleep until the main thread
    processes the command.

  This makes ngctl(8) depend on libedit, and libpthread. Thus, the
  new functionality isn't compiled in if release is being built
  with -DRELEASE_CRUNCH.

  PR:             bin/87352
  Reviewed by:    ru, Nuno Antunes <nuno.antunes gmail.com>
@
text
@a8 5

.if defined(RELEASE_CRUNCH)
NGCTL_NO_LIBEDIT=
.endif

a11 6
.if !defined(NGCTL_NO_LIBEDIT)
CFLAGS+= -DEDITLINE
DPADD+=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
LDADD+=	-pthread -ledit -ltermcap
.endif

@


1.14.8.2
log
@Merge rev. 1.17:
  Do not build the libedit support if NO_LIBPTHREAD is defined.

  PR:		bin/104478
  Submitted by:	Mike Durian <durian shadetreesoftware.com>
@
text
@d10 1
a10 1
.if defined(RELEASE_CRUNCH) || defined(NO_LIBPTHREAD)
@


1.14.8.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.sbin/ngctl/Makefile 168042 2007-03-30 08:25:53Z glebius $
@


1.14.8.2.4.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.13
log
@Add a GraphViz-exporting ngctl(8) "dot" command.  You can now create
very useful .dot files of your netgraph(4) to quickly visualize the
nodes, hooks and edges.  An example of this can be found here:
	http://people.freebsd.org/~green/sample-netgraph-dot.ps
If anyone would like to refine the output further, please do so.
@
text
@d8 1
a8 1

@


1.12
log
@Add ngctl "write" command.

MFC after:	1 week
@
text
@d6 1
a6 1
SRCS=	main.c mkpeer.c config.c connect.c name.c show.c list.c \
@


1.11
log
@Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.10 2001/07/20 04:23:09 obrien Exp $
d7 1
a7 1
	msg.c debug.c shutdown.c rmhook.c status.c types.c
@


1.10
log
@Remove GCC'isms in CFLAGS.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.9 2001/03/26 14:41:01 ru Exp $
d4 7
a10 6
PROG=		ngctl
SRCS=		main.c mkpeer.c config.c connect.c name.c show.c list.c \
		msg.c debug.c shutdown.c rmhook.c status.c types.c
MAN=		ngctl.8
DPADD+=		${LIBNETGRAPH}
LDADD+=		-lnetgraph
@


1.9
log
@- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.8 2001/03/20 18:16:51 ru Exp $
a9 1
COPTS+=		-Wall
@


1.8
log
@Set the default manual section for usr.sbin/ to 8.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.7 2001/03/17 08:59:31 phk Exp $
d7 1
@


1.7
log
@Backout my previous commit, it appearantly doesn't work for asynchronous
messages.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.6 2001/03/16 19:35:07 phk Exp $
a6 1
MAN8=		ngctl.8
@


1.6
log
@Add -ledit to ngctl.

Somebody submitted this long time ago, and it has been sitting in my
tree for months because I thought archie would pick it up.

Submitted by:	(sorry, lost track)
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.5 2000/07/03 13:34:18 phk Exp $
d9 1
a9 1
LDADD+=		-lnetgraph -ledit
@


1.5
log
@Experiemntal ascii based device configuration mechanism.

This may or may not survive, decision will be made well before 5.0-R
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.4 1999/11/30 02:45:30 archie Exp $
d9 1
a9 1
LDADD+=		-lnetgraph
@


1.4
log
@Add two new generic control messages, NGM_ASCII2BINARY and
NGM_BINARY2ASCII, which convert control messages to ASCII and back.
This allows control messages to be sent and received in ASCII form
using ngctl(8), which makes ngctl a lot more useful.

This also allows all the type-specific debugging code in libnetgraph
to go away -- instead, we just ask the node itself to do the ASCII
translation for us.

Currently, all generic control messages are supported, as well as
messages associated with the following node types: async, cisco,
ksocket, and ppp.

See /usr/share/examples/netgraph/ngctl for an example of using this.

Also give ngctl(8) the ability to print out incoming data and
control messages at any time.  Eventually nghook(8) may be subsumed.

Several other misc. bug fixes.

Reviewed by:	julian
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.3 1999/10/28 20:17:12 archie Exp $
d5 1
a5 1
SRCS=		main.c mkpeer.c connect.c name.c show.c list.c \
@


1.4.2.1
log
@MFC: add the NGM_TEXT_CONFIG primitive.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.4 1999/11/30 02:45:30 archie Exp $
d5 1
a5 1
SRCS=		main.c mkpeer.c config.c connect.c name.c show.c list.c \
@


1.4.2.2
log
@MFC: MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.4.2.1 2001/01/09 06:52:25 phk Exp $
d7 1
a7 1
MAN=		ngctl.8
@


1.4.2.3
log
@MFC: Add ngctl "write" command.
@
text
@d1 1
a1 1
# $FreeBSD$
d6 1
a6 1
		msg.c debug.c shutdown.c rmhook.c status.c types.c write.c
@


1.4.2.4
log
@MFC:

- New API functions for libnetgraph.
- Get rid of static buffers where possible.
- Fixed memory leak in NgSendAsciiMsg().
- WARNS fixes for ngctl(8).
- mdoc(7) cleanup for netgraph(3).
- Reduced gratuitous diffs to the trunk.
@
text
@d4 7
a10 7
PROG=	ngctl
MAN=	ngctl.8
SRCS=	main.c mkpeer.c config.c connect.c name.c show.c list.c \
	msg.c debug.c shutdown.c rmhook.c status.c types.c write.c
WARNS?=	1
DPADD=	${LIBNETGRAPH}
LDADD=	-lnetgraph
@


1.4.2.5
log
@MFC the "dot" command.
@
text
@d6 1
a6 1
SRCS=	main.c mkpeer.c config.c connect.c dot.c name.c show.c list.c \
@


1.4.2.6
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/usr.sbin/ngctl/Makefile 134080 2004-08-20 14:34:44Z ru $
@


1.3
log
@Limit COPTS added by Makefile to just '-Wall'.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.2 1999/10/27 22:14:04 archie Exp $
d6 1
a6 1
		debug.c shutdown.c rmhook.c status.c types.c
@


1.3.2.1
log
@MFC: bring in new files for netgraph.
Reviewed by:	Various, including but not limitted to: archie, phk, brian.
Obtained from: Whistle via -current
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.3 1999/10/28 20:17:12 archie Exp $
@


1.3.2.2
log
@MFC: make Netgraph in -stable match that in -current exactly
except where impossible to do so.
@
text
@d1 1
a1 1
# $FreeBSD$
d6 1
a6 1
		msg.c debug.c shutdown.c rmhook.c status.c types.c
@


1.2
log
@Remove extraneous -I compile flag that was used during testing.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.1 1999/10/21 09:06:06 julian Exp $
d8 1
a8 1

d10 1
a10 3
DPADD+=		/usr/lib/libnetgraph.a

COPTS+=		-O2 -g -Wall -Werror
@


1.1
log
@Whistle's Netgraph link-layer (sometimes more) networking infrastructure.
Been in production for 3 years now. Gives Instant Frame relay to if_sr
and if_ar drivers, and PPPOE support soon. See:
ftp://ftp.whistle.com/pub/archie/netgraph/index.html
for on-line manual pages.

Reviewed by: Doug Rabson (dfr@@freebsd.org)
Obtained from:  Whistle CVS tree
@
text
@d1 1
a1 1
# $FreeBSD$
a12 1
COPTS+=		-I/usr/src.freefall/sys
@

