cvs commit: src/bin/ed Makefile cbc.c ed.h

[Marius Strobl]

On Mon, Jun 02, 2003 at 12:06:28PM -0700, Mark Murray wrote:
> markm       2003/06/02 12:06:28 PDT
> 
>   FreeBSD src repository
> 
>   Modified files:
>     bin/ed               Makefile cbc.c ed.h 
>   Log:
>   Modernise. Use libcrypto for DES instead of libcipher.
>   

Hi,

the Makefile for ed(1) misses a check for NOOPENSSL now, it currently
breaks such buildworlds.


Index: Makefile
===================================================================
RCS file: /usr/data/bsd/cvs/fbsd/src/bin/ed/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	2 Jun 2003 19:06:28 -0000	1.23
+++ Makefile	7 Jun 2003 17:32:34 -0000
@@ -5,7 +5,7 @@
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)
+.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
 DISTRIBUTION=crypto
 CFLAGS+=-DDES
 DPADD=	${LIBCRYPTO}