From owner-svn-src-head@FreeBSD.ORG  Sat May 19 17:55:49 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2195106566C;
	Sat, 19 May 2012 17:55:49 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D30B8FC08;
	Sat, 19 May 2012 17:55:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4JHtnIX036631;
	Sat, 19 May 2012 17:55:49 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4JHtncx036628;
	Sat, 19 May 2012 17:55:49 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201205191755.q4JHtncx036628@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 19 May 2012 17:55:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235654 - in head: bin/ed share/mk
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 May 2012 17:55:49 -0000

Author: marcel
Date: Sat May 19 17:55:49 2012
New Revision: 235654
URL: http://svn.freebsd.org/changeset/base/235654

Log:
  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.

Modified:
  head/bin/ed/Makefile
  head/share/mk/bsd.own.mk

Modified: head/bin/ed/Makefile
==============================================================================
--- head/bin/ed/Makefile	Sat May 19 17:49:20 2012	(r235653)
+++ head/bin/ed/Makefile	Sat May 19 17:55:49 2012	(r235654)
@@ -7,12 +7,12 @@ SRCS=	buf.c cbc.c glbl.c io.c main.c re.
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 
-.if !defined(RELEASE_CRUNCH)
-.if ${MK_OPENSSL} != "no"
+.if !defined(RELEASE_CRUNCH) && \
+	${MK_OPENSSL} != "no" && \
+	${MK_ED_CRYPTO} != "no"
 CFLAGS+=-DDES
 DPADD=	${LIBCRYPTO}
 LDADD=	-lcrypto
 .endif
-.endif
 
 .include <bsd.prog.mk>

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat May 19 17:49:20 2012	(r235653)
+++ head/share/mk/bsd.own.mk	Sat May 19 17:55:49 2012	(r235654)
@@ -334,6 +334,7 @@ __DEFAULT_YES_OPTIONS = \
     CXX \
     DICT \
     DYNAMICROOT \
+    ED_CRYPTO \
     EXAMPLES \
     FLOPPY \
     FORTH \