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)

4 files changed, 15 insertions, 7 deletions

diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index 049fd39..e27bcc3 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR= 
-.if !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 SUBDIR+=libcrypto libssl
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 SUBDIR+=libssh
 .endif
 .endif
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 5c22f97..8dbd0e5 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=		crypto
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	4
@@ -164,7 +166,7 @@ SRCS+=	hmac.c
 INCS+=	hmac.h
 
 # idea
-.if defined(MAKE_IDEA)
+.if ${MK_IDEA} != "no"
 SRCS+=	i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c
 INCS+=	idea.h
 .endif
@@ -313,7 +315,7 @@ opensslconf.h: opensslconf-${MACHINE_ARCH}.h
 	cp ${.ALLSRC} ${.TARGET}
 
 evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h
-.if !defined(MAKE_IDEA)
+.if ${MK_IDEA} == "no"
 	sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC} > ${.TARGET}
 .else
 	cp ${.ALLSRC} ${.TARGET}
@@ -344,7 +346,7 @@ afterinstall:
 _bn_asmpath=	${LCRYPTO_SRC}/crypto/bn/asm
 .endif
 
-.if defined(MAKE_IDEA)
+.if ${MK_IDEA} != "no"
 _ideapath=	${LCRYPTO_SRC}/crypto/idea
 .endif
 
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 82ace34..5562062 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl
 LCRYPTO_DOC=	${.CURDIR}/../../../crypto/openssl/doc
 
@@ -7,7 +9,7 @@ CFLAGS+=	-DTERMIOS -DANSI_SOURCE
 CFLAGS+=	-I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR}
 CFLAGS+=	-DOPENSSL_THREADS
 
-.if !defined(MAKE_IDEA)
+.if ${MK_IDEA} == "no"
 CFLAGS+=	-DOPENSSL_NO_IDEA
 .endif
 
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index ddd6b5c..6a4231d 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	ssh
 SHLIB_MAJOR=	3
 SRCS=	acss.c authfd.c authfile.c bufaux.c buffer.c \
@@ -30,7 +32,7 @@ CFLAGS+= -I${SSHDIR}
 DPADD=	${LIBZ}
 LDADD=	-lz
 
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
 LDADD+=	-lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken