From e86ede0dfc4518dac9f7d307b79b9f6908409446 Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Mon, 5 May 2014 18:18:23 +0000
Subject: [PATCH] Leverage bsd.opts.mk

---
 share/mk/local.dirdeps.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk
index de95ba97a364..62e2c9fba41b 100644
--- a/share/mk/local.dirdeps.mk
+++ b/share/mk/local.dirdeps.mk
@@ -1,6 +1,10 @@
 .if !target(_DIRDEP_USE)
 # we are the 1st makefile
 
+.if !defined(MK_CTF)
+.include "${SRCTOP}/share/mk/bsd.opts.mk"
+.endif
+
 # DEP_MACHINE is set before we get here, this may not be.
 DEP_RELDIR ?= ${RELDIR}
 
@@ -39,7 +43,7 @@ DIRDEPS += gnu/lib/libssp/libssp_nonshared
 .endif
 
 # some optional things
-.if !defined(WITHOUT_CTF) && ${DEP_RELDIR:U${RELDIR}:Mcddl/usr.bin/ctf*} == ""
+.if ${MK_CTF} == "yes" && ${DEP_RELDIR:U${RELDIR}:Mcddl/usr.bin/ctf*} == ""
 DIRDEPS += \
 	cddl/usr.bin/ctfconvert.host \
 	cddl/usr.bin/ctfmerge.host