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)

9 files changed, 46 insertions, 26 deletions

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index a1961e5..404ba91 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,12 +1,16 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
 # XXX Use GNU versions: apropos bc dc diff grep ld man patch whatis
 # Moved to secure: bdes
 #
 
+.include <bsd.own.mk>
+
 SUBDIR=	alias \
 	apply \
 	asa \
@@ -232,59 +236,59 @@ SUBDIR=	alias \
 _truss=		truss
 .endif
 
-.if !defined(NO_ATM)
+.if ${MK_ATM} != "no"
 _atm=		atm
 .endif
 
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
 _catman=	catman
 .endif
 
-.if !defined(NO_BIND) && !defined(NO_BIND_UTILS)
+.if ${MK_BIND_UTILS} != "no"
 _dig=		dig
 _host=		host
 _nslookup=	nslookup
 _nsupdate=	nsupdate
 .endif
 
-.if !defined(NO_BLUETOOTH)
+.if ${MK_BLUETOOTH} != "no"
 _bluetooth=	bluetooth
 .endif
 
-.if !defined(NO_CALENDAR)
+.if ${MK_CALENDAR} != "no"
 _calendar=	calendar
 .endif
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 _chkey=		chkey
 _newkey=	newkey
 _csup=		csup
 .endif
 
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD} != "no"
 _hesinfo=	hesinfo
 .endif
 
-.if !defined(NO_NETCAT)
+.if ${MK_NETCAT} != "no"
 _nc=		nc
 .endif
 
-.if !defined(NO_NIS) 
+.if ${MK_NIS} != "no"
 _ypcat=		ypcat
 _ypmatch=	ypmatch
 _ypwhich=	ypwhich
 .endif
 
-.if !defined(NO_RCMDS)
+.if ${MK_RCMDS} != "no"
 _rlogin=	rlogin
 _rsh=		rsh
 .endif
 
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 _vacation=	vacation
 .endif
 
-.if !defined(NO_TOOLCHAIN)
+.if ${MK_TOOLCHAIN} != "no"
 _c89=		c89
 _c99=		c99
 _gprof=		gprof
@@ -293,7 +297,7 @@ _xlint=		xlint
 _yacc=		yacc
 .endif
 
-.if !defined(NO_USB)
+.if ${MK_USB} != "no"
 _usbhidaction=	usbhidaction
 _usbhidctl=	usbhidctl
 .endif
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index f3f5bd6..847e5c9 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -1,11 +1,13 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../newkey
 
 PROG=	chkey
 SRCS=	chkey.c generic.c update.c
 CFLAGS+= -I${.CURDIR}/../newkey
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
 DPADD=	${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO}
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 3ffb0ef..2bbdc08 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen
 
 PROG=	chpass
@@ -8,7 +10,7 @@ SRCS=	chpass.c edit.c field.c pw_scan.c table.c util.c
 BINOWN=	root
 BINMODE=4555
 WARNS?=	5
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
 #Some people need this, uncomment to activate
@@ -17,21 +19,21 @@ CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
 
 DPADD=	${LIBCRYPT} ${LIBUTIL}
 LDADD=	-lcrypt -lutil
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 DPADD+=	${LIBYPCLNT}
 LDADD+=	-lypclnt
 .endif 
 
 LINKS=	${BINDIR}/chpass ${BINDIR}/chfn
 LINKS+=	${BINDIR}/chpass ${BINDIR}/chsh
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 LINKS+=	${BINDIR}/chpass ${BINDIR}/ypchpass
 LINKS+=	${BINDIR}/chpass ${BINDIR}/ypchfn
 LINKS+=	${BINDIR}/chpass ${BINDIR}/ypchsh
 .endif
 
 MLINKS=	chpass.1 chfn.1 chpass.1 chsh.1
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
 .endif
 
diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile
index 68115a7..c422af8 100644
--- a/usr.bin/fetch/Makefile
+++ b/usr.bin/fetch/Makefile
@@ -1,11 +1,13 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=		fetch
 CSTD?=		c99
 WARNS?=		6
 DPADD=		${LIBFETCH}
 LDADD=		-lfetch
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 DPADD+=		${LIBSSL} ${LIBCRYPTO}
 LDADD+=		-lssl -lcrypto
 .endif
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index dcba8af..5b414bd 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,13 +1,15 @@
 # 	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	login
 SRCS=	login.c login_audit.c login_fbtab.c
 CFLAGS+=-DLOGALL
 DPADD=	${LIBUTIL} ${LIBPAM}
 LDADD=	-lutil ${MINUSLPAM} -lbsm
 
-.if !defined(NO_SETUID_LOGIN)
+.if ${MK_SETUID_LOGIN} != "no"
 BINOWN=	root
 BINMODE=4555
 PRECIOUSPROG=
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index b2c32dc..5bafeea 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/12/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	netstat
 SRCS=	if.c inet.c inet6.c main.c mbuf.c mcast.c mroute.c route.c \
 	unix.c atalk.c netgraph.c mroute6.c ipsec.c bpf.c pfkey.c
@@ -10,7 +12,7 @@ NO_WERROR=
 
 CFLAGS+=-DIPSEC
 CFLAGS+=-DFAST_IPSEC
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
 
@@ -19,7 +21,7 @@ BINMODE=2555
 DPADD=	${LIBKVM} ${LIBMEMSTAT} ${LIBNETGRAPH} ${LIBUTIL}
 LDADD=	-lkvm -lmemstat -lnetgraph -lutil
 
-.if !defined(NO_IPX)
+.if ${MK_IPX_SUPPORT} != "no"
 SRCS+=	ipx.c
 DPADD+=	${LIBIPX}
 LDADD+=	-lipx
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index 670aa3c..b3b5b51 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	newkey
 SRCS=	newkey.c generic.c update.c
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
 MAN=	newkey.8
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index ef68ba6..a1ce76b 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,12 +1,14 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG	 = passwd
 BINOWN	 = root
 BINMODE	 = 4555
 DPADD	 = ${LIBPAM}
 LDADD	 = ${MINUSLPAM}
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 LINKS	 = ${BINDIR}/passwd ${BINDIR}/yppasswd
 MLINKS	 = passwd.1 yppasswd.1
 .endif
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index e364934..424f261 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 TELNETDIR=	${.CURDIR}/../../contrib/telnet
 .PATH:		${TELNETDIR}/telnet
 
@@ -27,12 +29,12 @@ CFLAGS+=	-DHAS_CGETENT
 .endif
 
 .if !defined(RELEASE_CRUNCH)
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 SRCS+=		authenc.c 
 CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DIPSEC
 DPADD+=		${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
 LDADD+=		-lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM}
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
 DPADD+=		${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
 LDADD+=		-lkrb5 -lasn1 -lcom_err -lroken