From 0ed032933fe4bf3f047df5412d8df4df9da9c4d3 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Fri, 6 Jun 2014 04:09:07 +0000
Subject: When building picobsd, define WITHOUT_OPENSSL and WITHOUT_KERBEROS
 and remove the now-redundant checks for RELEASE_CRUNCH. This originally was
 defined for building smaller sysinstall images, but was later also used by
 picobsd builds for a similar purpose. Now that we've moved away from
 sysinstall, picobsd is the only remaining consumer of this interface. Adding
 these two options reduces the RELEASE_CRUNCH special cases in the tree by
 half.

---
 bin/ed/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'bin/ed')

diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index fb1c37d..cc47a42 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -7,9 +7,7 @@ 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"
+.if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no"
 CFLAGS+=-DDES
 DPADD=	${LIBCRYPTO}
 LDADD=	-lcrypto
-- 
cgit v1.1