head	1.37;
access;
symbols
	RELENG_8_4:1.37.0.2
	RELENG_9_1_0_RELEASE:1.35.2.1.4.2
	RELENG_9_1:1.35.2.1.0.4
	RELENG_9_1_BP:1.35.2.1
	RELENG_8_3_0_RELEASE:1.34.2.1.8.1
	RELENG_8_3:1.34.2.1.0.8
	RELENG_8_3_BP:1.34.2.1
	RELENG_9_0_0_RELEASE:1.35.2.1.2.1
	RELENG_9_0:1.35.2.1.0.2
	RELENG_9_0_BP:1.35.2.1
	RELENG_9:1.35.0.2
	RELENG_9_BP:1.35
	RELENG_7_4_0_RELEASE:1.33.12.1
	RELENG_8_2_0_RELEASE:1.34.2.1.6.1
	RELENG_7_4:1.33.0.12
	RELENG_7_4_BP:1.33
	RELENG_8_2:1.34.2.1.0.6
	RELENG_8_2_BP:1.34.2.1
	RELENG_8_1_0_RELEASE:1.34.2.1.4.1
	RELENG_8_1:1.34.2.1.0.4
	RELENG_8_1_BP:1.34.2.1
	RELENG_7_3_0_RELEASE:1.33.10.1
	RELENG_7_3:1.33.0.10
	RELENG_7_3_BP:1.33
	RELENG_8_0_0_RELEASE:1.34.2.1.2.1
	RELENG_8_0:1.34.2.1.0.2
	RELENG_8_0_BP:1.34.2.1
	RELENG_8:1.34.0.2
	RELENG_8_BP:1.34
	RELENG_7_2_0_RELEASE:1.33.8.1
	RELENG_7_2:1.33.0.8
	RELENG_7_2_BP:1.33
	RELENG_7_1_0_RELEASE:1.33.6.1
	RELENG_6_4_0_RELEASE:1.31.12.1
	RELENG_7_1:1.33.0.6
	RELENG_7_1_BP:1.33
	RELENG_6_4:1.31.0.12
	RELENG_6_4_BP:1.31
	RELENG_7_0_0_RELEASE:1.33
	RELENG_6_3_0_RELEASE:1.31
	RELENG_7_0:1.33.0.4
	RELENG_7_0_BP:1.33
	RELENG_6_3:1.31.0.10
	RELENG_6_3_BP:1.31
	RELENG_7:1.33.0.2
	RELENG_7_BP:1.33
	RELENG_6_2_0_RELEASE:1.31
	RELENG_6_2:1.31.0.8
	RELENG_6_2_BP:1.31
	RELENG_5_5_0_RELEASE:1.30
	RELENG_5_5:1.30.0.8
	RELENG_5_5_BP:1.30
	RELENG_6_1_0_RELEASE:1.31
	RELENG_6_1:1.31.0.6
	RELENG_6_1_BP:1.31
	RELENG_6_0_0_RELEASE:1.31
	RELENG_6_0:1.31.0.4
	RELENG_6_0_BP:1.31
	RELENG_6:1.31.0.2
	RELENG_6_BP:1.31
	RELENG_5_4_0_RELEASE:1.30
	RELENG_5_4:1.30.0.6
	RELENG_5_4_BP:1.30
	RELENG_4_11_0_RELEASE:1.18.2.2
	RELENG_4_11:1.18.2.2.0.2
	RELENG_4_11_BP:1.18.2.2
	RELENG_5_3_0_RELEASE:1.30
	RELENG_5_3:1.30.0.4
	RELENG_5_3_BP:1.30
	RELENG_5:1.30.0.2
	RELENG_5_BP:1.30
	RELENG_4_10_0_RELEASE:1.18.2.1
	RELENG_4_10:1.18.2.1.0.12
	RELENG_4_10_BP:1.18.2.1
	RELENG_5_2_1_RELEASE:1.29
	RELENG_5_2_0_RELEASE:1.29
	RELENG_5_2:1.29.0.2
	RELENG_5_2_BP:1.29
	RELENG_4_9_0_RELEASE:1.18.2.1
	RELENG_4_9:1.18.2.1.0.10
	RELENG_4_9_BP:1.18.2.1
	RELENG_5_1_0_RELEASE:1.22
	RELENG_5_1:1.22.0.2
	RELENG_5_1_BP:1.22
	RELENG_4_8_0_RELEASE:1.18.2.1
	RELENG_4_8:1.18.2.1.0.8
	RELENG_4_8_BP:1.18.2.1
	RELENG_5_0_0_RELEASE:1.21
	RELENG_5_0:1.21.0.2
	RELENG_5_0_BP:1.21
	RELENG_4_7_0_RELEASE:1.18.2.1
	RELENG_4_7:1.18.2.1.0.6
	RELENG_4_7_BP:1.18.2.1
	RELENG_4_6_2_RELEASE:1.18.2.1
	RELENG_4_6_1_RELEASE:1.18.2.1
	RELENG_4_6_0_RELEASE:1.18.2.1
	RELENG_4_6:1.18.2.1.0.4
	RELENG_4_6_BP:1.18.2.1
	RELENG_4_5_0_RELEASE:1.18.2.1
	RELENG_4_5:1.18.2.1.0.2
	RELENG_4_5_BP:1.18.2.1
	RELENG_4_4_0_RELEASE:1.18
	RELENG_4_4:1.18.0.6
	RELENG_4_4_BP:1.18
	RELENG_4_3_0_RELEASE:1.18
	RELENG_4_3:1.18.0.4
	RELENG_4_3_BP:1.18
	RELENG_4_2_0_RELEASE:1.18
	RELENG_4_1_1_RELEASE:1.18
	PRE_SMPNG:1.18
	RELENG_4_1_0_RELEASE:1.18
	RELENG_3_5_0_RELEASE:1.16.2.1
	RELENG_4_0_0_RELEASE:1.18
	RELENG_4:1.18.0.2
	RELENG_4_BP:1.18
	RELENG_3_4_0_RELEASE:1.16.2.1
	RELENG_3_3_0_RELEASE:1.16.2.1
	RELENG_3_2_PAO:1.16.0.4
	RELENG_3_2_PAO_BP:1.16
	RELENG_3_2_0_RELEASE:1.16
	RELENG_3_1_0_RELEASE:1.16
	RELENG_3:1.16.0.2
	RELENG_3_BP:1.16
	RELENG_2_2_8_RELEASE:1.13.2.1
	RELENG_3_0_0_RELEASE:1.16
	RELENG_2_2_7_RELEASE:1.13.2.1
	RELENG_2_2_6_RELEASE:1.13
	RELENG_2_2_5_RELEASE:1.13
	RELENG_2_2_2_RELEASE:1.13
	RELENG_2_2_1_RELEASE:1.13
	RELENG_2_2_0_RELEASE:1.13
	RELENG_2_1_7_RELEASE:1.10.4.3
	RELENG_2_1_6_1_RELEASE:1.10.4.3
	RELENG_2_1_6_RELEASE:1.10.4.2
	RELENG_2_2:1.13.0.2
	RELENG_2_2_BP:1.13
	RELENG_2_1_5_RELEASE:1.10.4.2
	RELENG_2_1_0_RELEASE:1.10
	RELENG_2_1_0:1.10.0.4
	RELENG_2_1_0_BP:1.10
	RELENG_2_0_5_RELEASE:1.10
	RELENG_2_0_5:1.10.0.2
	RELENG_2_0_5_BP:1.10
	RELENG_2_0_5_ALPHA:1.10
	RELEASE_2_0:1.9
	BETA_2_0:1.9
	ALPHA_2_0:1.9.0.2
	MOVED_NEWCVS:1.7
	FINAL_1_1:1.6
	GAMMA_1_1:1.6
	BETA_1_1:1.6.0.2
	BP_BETA_1_1:1.6
	FINAL_1_0:1.5
	EPSILON_1_0:1.5
	GAMMA_1_0:1.5
	BETA_1_0:1.4
	ALPHA_1_0:1.1.1.1
	V_0_6_0_0:1.1.1.1;
locks; strict;
comment	@# @;


1.37
date	2012.11.17.01.48.29;	author svnexp;	state Exp;
branches
	1.37.2.1;
next	1.36;

1.36
date	2012.05.19.17.55.49;	author marcel;	state Exp;
branches;
next	1.35;

1.35
date	2010.03.04.16.08.01;	author uqs;	state Exp;
branches
	1.35.2.1;
next	1.34;

1.34
date	2007.12.09.00.14.27;	author marius;	state Exp;
branches
	1.34.2.1;
next	1.33;

1.33
date	2007.07.02.14.00.25;	author kensmith;	state Exp;
branches
	1.33.2.1
	1.33.6.1
	1.33.8.1
	1.33.10.1
	1.33.12.1;
next	1.32;

1.32
date	2006.03.17.18.54.20;	author ru;	state Exp;
branches;
next	1.31;

1.31
date	2004.12.21.10.15.59;	author ru;	state Exp;
branches
	1.31.2.1
	1.31.12.1;
next	1.30;

1.30
date	2004.08.06.07.27.03;	author cperciva;	state Exp;
branches;
next	1.29;

1.29
date	2003.07.24.18.30.24;	author markm;	state Exp;
branches;
next	1.28;

1.28
date	2003.07.20.12.26.24;	author ru;	state Exp;
branches;
next	1.27;

1.27
date	2003.07.20.10.24.09;	author ru;	state Exp;
branches;
next	1.26;

1.26
date	2003.06.29.10.03.35;	author ru;	state Exp;
branches;
next	1.25;

1.25
date	2003.06.13.07.04.01;	author markm;	state Exp;
branches;
next	1.24;

1.24
date	2003.06.08.08.24.07;	author markm;	state Exp;
branches;
next	1.23;

1.23
date	2003.06.02.19.06.28;	author markm;	state Exp;
branches;
next	1.22;

1.22
date	2003.05.19.15.51.58;	author des;	state Exp;
branches;
next	1.21;

1.21
date	2001.12.06.10.50.23;	author ru;	state Exp;
branches;
next	1.20;

1.20
date	2001.12.04.01.57.40;	author obrien;	state Exp;
branches;
next	1.19;

1.19
date	2001.08.06.22.01.31;	author mike;	state Exp;
branches;
next	1.18;

1.18
date	2000.02.29.11.39.24;	author markm;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	99.08.27.23.14.11;	author peter;	state Exp;
branches;
next	1.16;

1.16
date	98.03.06.16.05.18;	author bde;	state Exp;
branches
	1.16.2.1;
next	1.15;

1.15
date	97.02.22.14.03.08;	author peter;	state Exp;
branches;
next	1.14;

1.14
date	97.01.14.05.30.25;	author jkh;	state Exp;
branches;
next	1.13;

1.13
date	95.10.22.20.14.13;	author ache;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	95.10.03.15.44.50;	author markm;	state Exp;
branches;
next	1.11;

1.11
date	95.10.01.14.17.29;	author markm;	state Exp;
branches;
next	1.10;

1.10
date	94.12.18.15.15.10;	author jkh;	state Exp;
branches
	1.10.4.1;
next	1.9;

1.9
date	94.10.29.10.13.34;	author phk;	state Exp;
branches;
next	1.8;

1.8
date	94.09.24.02.55.20;	author davidg;	state Exp;
branches;
next	1.7;

1.7
date	94.03.23.04.36.37;	author alm;	state Exp;
branches;
next	1.6;

1.6
date	94.02.01.00.34.31;	author alm;	state Exp;
branches;
next	1.5;

1.5
date	93.08.09.21.34.03;	author alm;	state Exp;
branches;
next	1.4;

1.4
date	93.08.02.16.43.54;	author conklin;	state Exp;
branches;
next	1.3;

1.3
date	93.08.02.16.40.59;	author conklin;	state Exp;
branches;
next	1.2;

1.2
date	93.07.20.22.57.03;	author nate;	state Exp;
branches;
next	1.1;

1.1
date	93.06.18.13.00.00;	author alm;	state Exp;
branches
	1.1.1.1;
next	;

1.37.2.1
date	2012.11.17.01.48.29;	author svnexp;	state dead;
branches;
next	1.37.2.2;

1.37.2.2
date	2013.03.28.13.00.04;	author svnexp;	state Exp;
branches;
next	;

1.35.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.35.2.1.2.1
	1.35.2.1.4.1;
next	1.35.2.2;

1.35.2.2
date	2012.11.17.11.36.03;	author svnexp;	state Exp;
branches;
next	;

1.35.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.35.2.1.2.2;

1.35.2.1.2.2
date	2012.11.17.08.36.05;	author svnexp;	state Exp;
branches;
next	;

1.35.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.35.2.1.4.2;

1.35.2.1.4.2
date	2012.11.17.08.46.53;	author svnexp;	state Exp;
branches;
next	;

1.34.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.34.2.1.2.1
	1.34.2.1.4.1
	1.34.2.1.6.1
	1.34.2.1.8.1;
next	1.34.2.2;

1.34.2.2
date	2012.11.17.10.35.48;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.34.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.34.2.1.8.2;

1.34.2.1.8.2
date	2012.11.17.08.24.31;	author svnexp;	state Exp;
branches;
next	;

1.33.2.1
date	2012.11.17.08.00.45;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.33.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.33.12.2;

1.33.12.2
date	2012.11.17.08.16.31;	author svnexp;	state Exp;
branches;
next	;

1.31.2.1
date	2012.11.17.07.38.34;	author svnexp;	state Exp;
branches;
next	;

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

1.18.2.1
date	2001.12.13.09.58.12;	author ru;	state Exp;
branches;
next	1.18.2.2;

1.18.2.2
date	2004.12.13.13.49.58;	author marius;	state Exp;
branches;
next	1.18.2.3;

1.18.2.3
date	2012.11.17.07.22.01;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1
date	99.08.29.14.12.21;	author peter;	state Exp;
branches;
next	;

1.13.2.1
date	98.07.15.02.01.22;	author jkh;	state Exp;
branches;
next	1.13.2.2;

1.13.2.2
date	99.09.05.10.59.40;	author peter;	state Exp;
branches;
next	;

1.10.4.1
date	96.05.29.22.18.55;	author jkh;	state Exp;
branches;
next	1.10.4.2;

1.10.4.2
date	96.06.05.02.35.34;	author jkh;	state Exp;
branches;
next	1.10.4.3;

1.10.4.3
date	96.11.24.09.31.31;	author joerg;	state Exp;
branches;
next	1.10.4.4;

1.10.4.4
date	99.09.05.11.01.22;	author peter;	state Exp;
branches;
next	;

1.1.1.1
date	93.06.18.13.00.01;	author alm;	state Exp;
branches;
next	;


desc
@@


1.37
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/bin/ed/Makefile 235654 2012-05-19 17:55:49Z marcel $

.include <bsd.own.mk>

PROG=	ed
SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
LINKS=	${BINDIR}/ed ${BINDIR}/red
MLINKS=	ed.1 red.1

.if !defined(RELEASE_CRUNCH) && \
	${MK_OPENSSL} != "no" && \
	${MK_ED_CRYPTO} != "no"
CFLAGS+=-DDES
DPADD=	${LIBCRYPTO}
LDADD=	-lcrypto
.endif

.include <bsd.prog.mk>
@


1.37.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:00:04 +0000
@
text
@d1 18
@


1.37.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 19
# $FreeBSD: releng/8.4/bin/ed/Makefile 174469 2007-12-09 00:14:27Z marius $

.include <bsd.own.mk>

PROG=	ed
SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
WARNS?=	2
LINKS=	${BINDIR}/ed ${BINDIR}/red
MLINKS=	ed.1 red.1

.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
CFLAGS+=-DDES
DPADD=	${LIBCRYPTO}
LDADD=	-lcrypto
.endif
.endif

.include <bsd.prog.mk>
@


1.36
log
@SVN rev 235654 on 2012-05-19 17:55:49Z by marcel

Add build option MK_ED_CRYPTO to control whether ed(1) is to have the
ability to encrypt/decrypt files. Embedded systems can typically have
OpenSSL, but not for ed(1) to use it.

Obtained from:	Juniper Networks, Inc.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.35
log
@SVN rev 204711 on 2010-03-04 16:08:01Z by uqs

ed(1): make WARNS=6 clean

Although argc and argv are never read after the longjmp is complete,
gcc is not clever enough to see that and needlessly warns about it.
So add volatile to silence the compiler.

Approved by:	ed (the co-mentor, not ed(1))
@
text
@d10 3
a12 2
.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
a16 1
.endif
@


1.35.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.35.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
@d1 1
a1 1
# $FreeBSD: stable/9/bin/ed/Makefile 204711 2010-03-04 16:08:01Z uqs $
@


1.35.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.35.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/bin/ed/Makefile 204711 2010-03-04 16:08:01Z uqs $
@


1.35.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.35.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/bin/ed/Makefile 204711 2010-03-04 16:08:01Z uqs $
@


1.34
log
@Move WARNS as ed(1) also is only WARNS = 2 clean in the !DES case.
This fixes its compilation if MK_OPENSSL == no and also obsoletes
release/Makefile rev. 1.192. The latter isn't reverted though as
support for the fixit floppy and the rest of the boot floppies is
scheduled to be deorbited anyway.

Discussed with:	kensmith
@
text
@a6 1
WARNS?=	2
@


1.34.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.34.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/bin/ed/Makefile 174469 2007-12-09 00:14:27Z marius $
@


1.34.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.34.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/bin/ed/Makefile 174469 2007-12-09 00:14:27Z marius $
@


1.34.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.34.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.34.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.33
log
@Don't include encryption features of ed(1) when building for the
"rescue media" bundled with releases.

Suggested by:	ru
Approved by:	re (hrs)
@
text
@d7 1
a13 1
WARNS?=	2
@


1.33.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/bin/ed/Makefile 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.33.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.33.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/bin/ed/Makefile 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.33.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.33.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.33.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.32
log
@Reimplementation of world/kernel build options.  For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
@
text
@d10 1
d17 1
@


1.31
log
@NOCRYPT -> NO_CRYPT
@
text
@d3 2
d10 1
a10 1
.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
@


1.31.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/bin/ed/Makefile 147906 2005-07-11 04:14:43Z cvs2svn $
@


1.31.12.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.30
log
@Join the 21st century: Cryptography is no longer an optional component
of releases.  The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

Approved by:	re (scottl), markm
Discussed on:	freebsd-current, in late April 2004
@
text
@d8 1
a8 1
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
@


1.29
log
@Don't check for the existance of src/crypto/ for building items that
may contain crypto. The days of ITAR paranoia are over, and the simple
macro tests that remain are sufficient.
@
text
@a8 1
DISTRIBUTION=crypto
@


1.28
log
@This code isn't WARNS=6 clean in the standard (crypto) case
due to bugs in OpenSSL headers.  I was testing in the wrong
environmement: standalone build without crypto/ sources.
@
text
@d8 1
a8 1
.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
@


1.27
log
@Make this code WARNS=6 clean again (after GCC 3.1.1 import).

Submitted by:	Marius Strobl <marius@@alchemy.franken.de>
@
text
@d11 1
@


1.26
log
@Unbreak NOCRYPT buildworld.

Reviewed by:	markm
@
text
@a10 1
WARNS=	2
@


1.25
log
@Get this area compiling with the highest WARNS= that it works with.
Obsolete WFORMAT= junk also removed where possible.

OK'ed by:	obrien
Tested on:	sparc64, alpha, i386
@
text
@d8 1
a8 1
.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL)
@


1.24
log
@Fix for the NO_OPENSSL case.

Reported by:	Marius Strobl <marius@@alchemy.franken.de>
@
text
@d11 1
@


1.23
log
@Modernise. Use libcrypto for DES instead of libcipher.
@
text
@d8 1
a8 1
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)
@


1.22
log
@Retire the useless NOSECURE knob.

Approved by:	re (scottl)
@
text
@d11 2
a12 2
DPADD=	${LIBCIPHER}
LDADD=	-lcipher
@


1.21
log
@-lcipher is an installable library.
@
text
@d8 1
a8 1
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
@


1.20
log
@Default to WARNS=2.  Binary builds that cannot handle this must explicitly
set WARNS=0.

Reviewed by:	mike
@
text
@d11 2
a12 2
LDADD+= -L${CIPHEROBJDIR} -lcipher
DPADD+= ${CIPHEROBJDIR}/libcipher.a
@


1.19
log
@o Correctly define rcsid.
o Add consts where appropriate.
o Rename some variables that were shadowing global declarations.
o Remove register storage-classes.
o Make errmsg a const, so we can just set error messages instead
  of using sprintf/strcpy.
o Set WARNS=2

Reviewed by:	bde, des
@
text
@d1 1
a1 1
# $FreeBSD: src/bin/ed/Makefile,v 1.18 2000/02/29 11:39:24 markm Exp $
a4 1
WARNS?=	2
@


1.18
log
@Change DISTRIBUTION name to match reality.
@
text
@d1 1
a1 1
# $FreeBSD: src/bin/ed/Makefile,v 1.17 1999/08/27 23:14:11 peter Exp $
d5 1
@


1.18.2.1
log
@MFC: -lcipher is an installable library.
@
text
@d1 1
a1 1
# $FreeBSD$
d11 2
a12 2
DPADD=	${LIBCIPHER}
LDADD=	-lcipher
@


1.18.2.2
log
@MFC:
Makefile.inc1 1.361
bin/ed/Makefile 1.22
lib/Makefile 1.157
lib/libcrypt/Makefile 1.31
lib/libfetch/Makefile 1.41
lib/libpam/modules/modules.inc 1.17
libexec/Makefile 1.61
share/examples/etc/make.conf 1.215
share/man/man5/make.conf.5 1.73
usr.bin/Makefile 1.239
usr.bin/fetch/Makefile 1.14
usr.sbin/pkg_install/Makefile 1.14
usr.sbin/pkg_install/add/Makefile 1.17
usr.sbin/pkg_install/info/Makefile 1.17
usr.sbin/pkg_install/version/Makefile 1.12
usr.sbin/ppp/Makefile 1.95, 1.96
usr.sbin/pppd/Makefile 1.25
usr.sbin/sendmail/Makefile 1.40
usr.sbin/tcpdump/tcpdump/Makefile 1.36

Retire the useless NOSECURE knob.

The motivation for this MFC is that MAKE_KERBEROS4 and MAKE_KERBEROS5
are meant to be buildable by various makefiles when NOSECURE is set but
this was broken because Kerberos depends on e.g. des(3) from OpenSSL
which wasn't built when NOSECURE was defined. Fixing the NOSECURE knob
however would have meant to make it do the same as the NOCRYPT knob.
If you had been using the NOSECURE build knob please now use the NOCRYPT
knob instead.

Discussed with:	ru (some months ago)
Reviewed by:	ru (some months ago)
Approved by:	markm (telnet and secure bits, some months ago), kensmith (re)
@
text
@d8 1
a8 1
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)
@


1.18.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/bin/ed/Makefile 138803 2004-12-13 13:50:02Z marius $
@


1.17
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d9 1
a9 1
DISTRIBUTION=des
@


1.16
log
@Fixed existence test for secure sources (don't test for secure objects).

Fixed some formatting.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.15 1997/02/22 14:03:08 peter Exp $
@


1.16.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.15
log
@Revert $FreeBSD$ to $Id$
@
text
@d1 1
a1 1
#	$Id$
d5 2
a6 2
LINKS=  ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
d8 1
a8 1
.if exists(../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
@


1.14
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d1 1
a1 1
#	$FreeBSD$
@


1.13
log
@Wrong library was picked by ed
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.12 1995/10/03 15:44:50 markm Exp $
@


1.13.2.1
log
@MFC: man page fixes, octal char support for ls, misc fixes to cp, etc.
Sorry Bruce, that's the best description you're going to get considering
the number of merges I still have to make. :)
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.13 1995/10/22 20:14:13 ache Exp $
d5 2
a6 2
LINKS=	${BINDIR}/ed ${BINDIR}/red
MLINKS=	ed.1 red.1
d8 1
a8 1
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
@


1.13.2.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.12
log
@Correctly build the secure ed(1) only if secure/ exists.
Pointed out by:	bde
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.11 1995/10/01 14:17:29 markm Exp $
d11 2
a12 2
LDADD+= -L${CRYPTOBJDIR} -ldescrypt
DPADD+= ${CRYPTOBJDIR}/libdescrypt.a
@


1.11
log
@Use the same make technique as passwd and xntpd for the secure ed(1). This
will allow the secure/bin/ed directory to be cleaned out and the bin/Makefile
to be cleaned up.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.10 1994/12/18 15:15:10 jkh Exp $
d8 1
a8 1
.if !defined(NOCRYPT) && !defined(NOSECURE)
@


1.10
log
@src/bin/ed will never build DES encumbered ed again.  That is the job
for secure/bin/ed ...
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.9 1994/10/29 10:13:34 phk Exp $
d4 1
a4 1
SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
d7 7
@


1.10.4.1
log
@Merge from HEAD, except:

	Clients that used gnumalloc still do, despite the merge.  We're not
	bringing phkmalloc over.

	Thread stuff left out.

	PCCARD support left out.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.10 1994/12/18 15:15:10 jkh Exp $
d4 1
a4 1
SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
a6 7

.if exists(../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
DISTRIBUTION=des
CFLAGS+=-DDES
LDADD+= -L${CIPHEROBJDIR} -lcipher
DPADD+= ${CIPHEROBJDIR}/libcipher.a
.endif
@


1.10.4.2
log
@This 3rd mega-commit should hopefully bring us back to where we were.
I can get it to `make world' succesfully, anyway!
@
text
@d4 1
a4 1
SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
d7 7
@


1.10.4.3
log
@Merge the Makefile changes from -current that allow to build both
versions, the DES-contaminated and the exportable one, during a `make
release'.  This should fix the problems where /sbin/init and /bin/ed
have been missing in the `des' distribution of 2.1.6.

Requested by:	jkh
Reviewed by:	markm
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.13 1995/10/22 20:14:13 ache Exp $
d4 1
a4 1
SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
a6 7

.if exists(../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
DISTRIBUTION=des
CFLAGS+=-DDES
LDADD+= -L${CIPHEROBJDIR} -lcipher
DPADD+= ${CIPHEROBJDIR}/libcipher.a
.endif
@


1.10.4.4
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.9
log
@Don't check existence of -lcrypt to decide if DES is employed,
instead check that "NOCRYPT" isn't defined.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.8 1994/09/24 02:55:20 davidg Exp $
a6 6

.if !defined(NOCRYPT)
CFLAGS+=-DDES
LDADD+= -lcrypt
DPADD+= ${LIBCRYPT}
.endif
@


1.8
log
@Added $Id$
@
text
@d1 1
a1 1
#	$Id$
d8 1
a8 1
.if exists(/usr/lib/libcrypt.a)
@


1.7
log
@use umask 077 for buffer file
@
text
@d1 2
@


1.6
log
@Fixed range address bug: 1,2, == 2,2   not 2,.
Overhauled the name space,  reworked some modules and removed the
obsolescent Addison-Wesley copyright.
@
text
@d2 1
a2 1
SRCS=	 buf.c cbc.c glob.c io.c main.c re.c sub.c undo.c
@


1.5
log
@added (unsiged) cast to avoid int overflow
removed REGEX directive
@
text
@d2 3
a4 4
CFLAGS+=-DVI_BANG
SRCS=	ed.c re.c buf.c cbc.c 
LINKS=	${BINDIR}/ed ${BINDIR}/red
MLINKS=	ed.1 red.1
a10 3

LDADD+=	-lgnuregex
DPADD+=	/usr/lib/libgnuregex.a
@


1.4
log
@Remove -I${.CURDIR}, as we now use system's regex.h
@
text
@d2 1
a2 1
CFLAGS+=-DVI_BANG -DGNU_REGEX
@


1.3
log
@Use system's posix compliant regex library (GNU regex for now).
@
text
@d2 1
a2 1
CFLAGS+=-I${.CURDIR} -DVI_BANG -DGNU_REGEX
@


1.2
log
@Libcrypt upgrade
@
text
@d2 2
a3 2
CFLAGS+=-I${.CURDIR} -DVI_BANG -DGNU_REGEX -DHAVE_STRING_H=1
SRCS=	ed.c re.c buf.c cbc.c regex.c
d9 1
a10 1
LDADD+= -lcrypt
d13 2
@


1.1
log
@Initial revision
@
text
@d2 1
a2 1
CFLAGS+=-I${.CURDIR} -DVI_BANG -DDES -DGNU_REGEX -DHAVE_STRING_H=1
d6 7
@


1.1.1.1
log
@POSIX ed version 0.6 by Andrew Moore (alm@@netcom.com).
@
text
@@
