From 388e590f951441f619cd32710dc151e0ac810a10 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Fri, 17 Mar 2006 18:54:44 +0000
Subject: 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)
---
 usr.bin/Makefile | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'usr.bin/Makefile')

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
-- 
cgit v1.1