From owner-cvs-all@FreeBSD.ORG  Sat Jun  7 17:29:18 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3EC6637B401; Sat,  7 Jun 2003 17:29:18 -0700 (PDT)
Received: from newtrinity.zeist.de (newtrinity.zeist.de [217.24.217.8])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1FB4143F85; Sat,  7 Jun 2003 17:29:17 -0700 (PDT)
	(envelope-from marius@newtrinity.zeist.de)
Received: from newtrinity.zeist.de (localhost [127.0.0.1])
	h580TFNQ054090;	Sun, 8 Jun 2003 02:29:15 +0200 (CEST)
	(envelope-from marius@newtrinity.zeist.de)
Received: (from marius@localhost)
	by newtrinity.zeist.de (8.12.9/8.12.9/Submit) id h580TAYo054089;
	Sun, 8 Jun 2003 02:29:10 +0200 (CEST)
	(envelope-from marius)
Date: Sun, 8 Jun 2003 02:29:10 +0200
From: Marius Strobl <marius@alchemy.franken.de>
To: Mark Murray <markm@freebsd.org>
Message-ID: <20030608022910.A1610@newtrinity.zeist.de>
References: <200306021906.h52J6TvX080958@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5.1i
In-Reply-To: <200306021906.h52J6TvX080958@repoman.freebsd.org>;
	from markm@freebsd.org on Mon, Jun 02, 2003 at 12:06:28PM -0700
cc: cvs-src@freebsd.org
cc: src-committers@freebsd.org
cc: ru@freebsd.org
cc: cvs-all@freebsd.org
Subject: Re: cvs commit: src/bin/ed Makefile cbc.c ed.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Jun 2003 00:29:18 -0000

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}