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, 16 insertions, 8 deletions

diff --git a/sbin/Makefile b/sbin/Makefile
index bf43850..a2daff4 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.5 (Berkeley) 3/31/94
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # XXX MISSING:		icheck ncheck
 
 SUBDIR=	adjkerntz \
@@ -92,24 +94,24 @@ SUBDIR=	adjkerntz \
 	tunefs \
 	umount \
 
-.if !defined(NO_ATM)
+.if ${MK_ATM} != "no"
 _atm=		atm
 .endif
 
-.if !defined(NO_CXX)
+.if ${MK_CXX} != "no"
 _devd=		devd
 .endif
 
-.if !defined(NO_IPFILTER)
+.if ${MK_IPFILTER} != "no"
 _ipf=		ipf
 .endif
 
-.if !defined(NO_PF)
+.if ${MK_PF} != "no"
 _pfctl=		pfctl
 _pflogd=	pflogd
 .endif
 
-.if !defined(NO_INET6)
+.if ${MK_INET6} != "no"
 _ip6fw=		ip6fw
 _ping6=		ping6
 .endif
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index d1fed26..70d6584 100644
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@@ -1,9 +1,11 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BINDIR?=	/sbin
 WARNS?=	2
 
-.if defined(NO_DYNAMICROOT)
+.if ${MK_DYNAMICROOT} == "no"
 NO_SHARED?=	YES
 .endif
diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile
index e172bbf..6ebdc66 100644
--- a/sbin/geom/class/Makefile
+++ b/sbin/geom/class/Makefile
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=	concat
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 SUBDIR+=eli
 .endif
 SUBDIR+=label
diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile
index 97094d6..03ef1ba 100644
--- a/sbin/ggate/Makefile
+++ b/sbin/ggate/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=	${_ggatec} \
 	${_ggated} \
 	ggatel
 
-.if !defined(NO_LIBPTHREAD)
+.if ${MK_LIBPTHREAD} != "no"
 _ggatec=	ggatec
 _ggated=	ggated
 .endif