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)

24 files changed, 112 insertions, 65 deletions

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index b4212d7..0618b6e 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,6 +1,8 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # XXX MISSING:		mkproto
 SUBDIR=	ac \
 	accton \
@@ -195,23 +197,22 @@ SUBDIR=	ac \
 _sysinstall=	sysinstall
 .endif
 
-.if !defined(NO_ATM)
+.if ${MK_ATM} != "no"
 _atm=		atm
 .endif
 
-.if !defined(NO_AUDIT)
+.if ${MK_AUDIT} != "no"
 _audit= 	audit
 _auditd=	auditd
 _auditreduce=	auditreduce
 _praudit=	praudit
 .endif
 
-.if !defined(NO_BIND)
-.if !defined(NO_BIND_DNSSEC) && !defined(NO_CRYPT)
+.if ${MK_BIND_DNSSEC} != "no" && ${MK_OPENSSL} != "no"
 _dnssec-keygen=		dnssec-keygen
 _dnssec-signzone=	dnssec-signzone
 .endif
-.if !defined(NO_BIND_NAMED)
+.if ${MK_BIND_NAMED} != "no"
 _named=			named
 _named-checkconf=	named-checkconf
 _named-checkzone=	named-checkzone
@@ -219,24 +220,23 @@ _named.reload=		named.reload
 _rndc=			rndc
 _rndc-confgen=		rndc-confgen
 .endif
-.endif
 
-.if !defined(NO_BLUETOOTH)
+.if ${MK_BLUETOOTH} != "no"
 _bluetooth=	bluetooth
 .endif
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 _keyserv=	keyserv
 .endif
 
-.if !defined(NO_INET6)
+.if ${MK_INET6} != "no"
 _mld6query=	mld6query
 _rip6query=	rip6query
 _route6d=	route6d
 _traceroute6=	traceroute6
 .endif
 
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 _rpc.yppasswdd=	rpc.yppasswdd
 _rpc.ypupdated=	rpc.ypupdated
 _rpc.ypxfrd=	rpc.ypxfrd
@@ -248,15 +248,15 @@ _ypserv=	ypserv
 _ypset=		ypset
 .endif
 
-.if !defined(NO_PF) && !defined(NO_AUTHPF)
+.if ${MK_AUTHPF} != "no"
 _authpf=	authpf
 .endif
 
-.if !defined(NO_LPR)
+.if ${MK_LPR} != "no"
 _lpr=		lpr
 .endif
 
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 _editmap=	editmap
 _mailstats=	mailstats
 _makemap=	makemap
@@ -264,7 +264,7 @@ _praliases=	praliases
 _sendmail=	sendmail
 .endif
 
-.if !defined(NO_USB)
+.if ${MK_USB} != "no"
 _usbdevs=	usbdevs
 .endif
 
@@ -277,7 +277,7 @@ _apm=		apm
 _apmd=		apmd
 _asf=		asf
 _btxld=		btxld
-.if !defined(NO_I4B)
+.if ${MK_I4B} != "no"
 _i4b=		i4b
 .endif
 _kgmon=		kgmon
@@ -289,19 +289,19 @@ _mptable=	mptable
 _ndiscvt=	ndiscvt
 _pccard=	pccard
 _pnpinfo=	pnpinfo
-.if !defined(NO_LIBPTHREAD)
+.if ${MK_LIBPTHREAD} != "no"
 _pppctl=	pppctl
 .endif
 _sicontrol=	sicontrol
 _spkrtest=	spkrtest
 _zzz=		zzz
 .if ${MACHINE} == "i386" 
-.if !defined(NO_ACPI)
+.if ${MK_ACPI} != "no"
 _acpi=		acpi
 .endif
 _arlcontrol=	arlcontrol
 _boot0cfg=	boot0cfg
-.if !defined(NO_PCVT)
+.if ${MK_PCVT} != "no"
 _pcvt=		pcvt
 .endif
 _wlconfig=	wlconfig
@@ -313,7 +313,7 @@ _boot98cfg=	boot98cfg
 .if ${MACHINE_ARCH} == "alpha"
 _elf2exe=	elf2exe
 _pnpinfo=	pnpinfo
-.if !defined(NO_LIBC_R)
+.if ${MK_LIBC_R} != "no"
 _pppctl=	pppctl
 .endif
 .endif
@@ -322,7 +322,7 @@ _pppctl=	pppctl
 # mptable: broken (not 64 bit clean)
 # pnpinfo: crashes (not really useful anyway)
 .if ${MACHINE_ARCH} == "amd64"
-.if !defined(NO_ACPI)
+.if ${MK_ACPI} != "no"
 _acpi=		acpi
 .endif
 _asf=		asf
@@ -334,7 +334,7 @@ _mount_nwfs=	mount_nwfs
 _mount_smbfs=	mount_smbfs
 _mptable=	mptable
 _ndiscvt=	ndiscvt
-.if !defined(NO_LIBPTHREAD)
+.if ${MK_LIBPTHREAD} != "no"
 _pppctl=	pppctl
 .endif
 _sicontrol=	sicontrol
@@ -343,11 +343,11 @@ _zzz=		zzz
 .endif
 
 .if ${MACHINE_ARCH} == "ia64"
-.if !defined(NO_ACPI)
+.if ${MK_ACPI} != "no"
 _acpi=		acpi
 .endif
 _kgmon=		kgmon
-.if !defined(NO_LIBPTHREAD)
+.if ${MK_LIBPTHREAD} != "no"
 _pppctl=	pppctl
 .endif
 _zzz=		zzz
@@ -360,7 +360,7 @@ _mount_smbfs=	mount_smbfs
 .if ${MACHINE_ARCH} == "sparc64"
 _eeprom=	eeprom
 _ofwdump=	ofwdump
-.if !defined(NO_LIBC_R)
+.if ${MK_LIBC_R} != "no"
 _pppctl=	pppctl
 .endif
 .endif
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index d4d21f7..afb287f 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -9,6 +9,8 @@
 #	Portions derived from amd/libamu/Makefile
 #	$NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
 
+.include <bsd.own.mk>
+
 CFLAGS+= -I. -I${.CURDIR} 
 CFLAGS+= -I${.CURDIR}/../include
 .if exists(${.OBJDIR}/../include)
@@ -17,11 +19,11 @@ CFLAGS+= -I${.OBJDIR}/../include
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd
 CFLAGS+= -DHAVE_CONFIG_H
-.if defined(NO_NIS)
+.if ${MK_NIS} == "no"
 CFLAGS+= -DHAVE_LOCALCONFIG_H
 .endif
 
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD_SUPPORT} != "no"
 CFLAGS+= -DYES_HESIOD
 .endif
 
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 3509d66..3cc8657 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -6,6 +6,8 @@
 # $FreeBSD$
 #
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../../contrib/amd/amd
 
 PROG=	amd
@@ -39,11 +41,11 @@ CLEANFILES+=	mount_xdr.c
 mount_xdr.c: ${MOUNT_X}
 	${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET}
 
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD_SUPPORT} != "no"
 SRCS+=	info_hesiod.c
 .endif
 
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 SRCS+=	info_nis.c
 .endif
 
diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile
index 7fa54ae..df770d1 100644
--- a/usr.sbin/amd/include/Makefile
+++ b/usr.sbin/amd/include/Makefile
@@ -7,8 +7,10 @@
 #	Portions derived from amd/libamu/Makefile
 #	$NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
 
+.include <bsd.own.mk>
+
 SRCS=	config_local.h
-.if defined(NO_NIS)
+.if ${MK_NIS} == "no"
 SRCS+=	localconfig.h
 .endif
 CLEANFILES=	${SRCS}
@@ -21,7 +23,7 @@ config_local.h: newvers.sh
 
 localconfig.h:
 	@rm -f ${.TARGET}
-	@echo "/* NIS disabled by NO_NIS make.conf option */" >> ${.TARGET}
+	@echo "/* NIS disabled by WITHOUT_NIS src.conf option */" >> ${.TARGET}
 	@echo "#undef HAVE_MAP_NIS" >> ${.TARGET}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index af8a0dc..5d2047b 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -1,13 +1,15 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	bootparamd
 MAN=	bootparams.5 bootparamd.8
 SRCS=	bootparamd.c main.c ${GENSRCS}
 GENSRCS=bootparam_prot.h bootparam_prot_svc.c bootparam_prot_xdr.c
 
 CFLAGS+= -DTFTP_DIR=\"/tftpboot\" -I.
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
 
diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile
index faa5650..f5a2e41 100644
--- a/usr.sbin/bsnmpd/modules/Makefile
+++ b/usr.sbin/bsnmpd/modules/Makefile
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../../contrib/bsnmp/snmpd
 
-.if !defined(NO_ATM)
+.if ${MK_ATM} != "no"
 _snmp_atm= snmp_atm
 .endif
 
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 6d52dad..3f305f7 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-.if !defined(NO_MAILWRAPPER)
+.include <bsd.own.mk>
+
+.if ${MK_MAILWRAPPER} != "no"
 PROG=	mailwrapper
 MAN=	mailwrapper.8
 
@@ -8,19 +10,19 @@ DPADD=	${LIBUTIL}
 LDADD=	-lutil
 .endif
 
-.if !defined(NO_MAILWRAPPER) || !defined(NO_SENDMAIL)
+.if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no"
 SYMLINKS= 	${BINDIR}/mailwrapper /usr/sbin/sendmail  \
 		${BINDIR}/mailwrapper /usr/sbin/hoststat  \
 		${BINDIR}/mailwrapper /usr/sbin/purgestat \
 		${BINDIR}/mailwrapper /usr/bin/newaliases \
 		${BINDIR}/mailwrapper /usr/bin/mailq
 
-.if defined(NO_MAILWRAPPER) && !defined(NO_SENDMAIL)
+.if ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} != "no"
 SYMLINKS+=	/usr/libexec/sendmail/sendmail ${BINDIR}/mailwrapper
 .endif
 .endif
 
-.if !defined(NO_MAILWRAPPER)
+.if ${MK_MAILWRAPPER} != "no"
 .if !exists(${DESTDIR}/etc/mail/mailer.conf)
 FILES=		${.CURDIR}/../../etc/mail/mailer.conf
 FILESDIR=	/etc/mail
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index 3a85910..dee6598 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 DEFS_LOCAL= -DPARSE -DHAVE_CONFIG_H
 NTPDEFS=   -DSYS_FREEBSD
 # CLOCKDEFS=
@@ -8,7 +10,7 @@ NTPDEFS=   -DSYS_FREEBSD
 #	-DMX4200 -DNMEA -DBOEDER
 CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
 CFLAGS+= -DOPENSSL
 .endif
 
diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index d49a0db..7788094 100644
--- a/usr.sbin/ntp/doc/Makefile
+++ b/usr.sbin/ntp/doc/Makefile
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 FILESDIR=	${SHAREDIR}/doc/ntp
 
-.if !defined(NO_HTML)
+.if ${MK_HTML} != "no"
 FILES=	accopt.html assoc.html audio.html authopt.html build.html \
 	clockopt.html \
 	config.html confopt.html copyright.html debug.html driver1.html \
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index 7ccdee2..5211b6f 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -1,17 +1,20 @@
 # $FreeBSD$
 
+NO_MAN=
+
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../../contrib/ntp/util \
        ${.CURDIR}/../../../contrib/ntp/ntpd
 
 PROG=	ntp-keygen
-NO_MAN=
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 
 DPADD=	${LIBNTP}
 LDADD=	${LIBNTP}
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
 DPADD+=	${LIBMD} ${LIBCRYPTO}
 LDADD+=	-lmd -lcrypto
 .endif
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index 5b3fdba..82c99c8 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -1,9 +1,12 @@
 # $FreeBSD$
 
+NO_MAN=
+
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd
 
 PROG=	ntpd
-NO_MAN=
 SRCS=	cmd_args.c	map_vme.c	ntp_config.c \
 	ntp_control.c	ntp_crypto.c	ntp_filegen.c \
 	ntp_intres.c	ntp_io.c	ntp_loopfilter.c \
@@ -31,7 +34,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 DPADD=	${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD}
 LDADD=	${LIBPARSE} ${LIBNTP} -lm -lmd
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
 DPADD+=	${LIBCRYPTO}
 LDADD+=	-lcrypto
 .endif
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index 730308c..1e42b43 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -1,9 +1,12 @@
 # $FreeBSD$
 
+NO_MAN=
+
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc
 
 PROG=	ntpdc
-NO_MAN=
 SRCS= 	ntpdc.c ntpdc_ops.c version.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
@@ -11,7 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 DPADD=	${LIBNTP} ${LIBMD}
 LDADD=	${LIBNTP} -lmd
 
-.if !defined(NO_GNU)
+.if ${MK_GNU_SUPPORT} != "no"
 DPADD+=		${LIBREADLINE} ${LIBTERMCAP}
 LDADD+=		-lreadline -ltermcap
 CFLAGS+=	-DHAVE_LIBREADLINE -DHAVE_READLINE_HISTORY_H \
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index 613e02e..6e749d6 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -1,11 +1,14 @@
 # $FreeBSD$
 
+NO_MAN=
+
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpq
 
 BINDIR=	/usr/bin
 
 PROG=	ntpq
-NO_MAN=
 SRCS= 	ntpq.c ntpq_ops.c version.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
@@ -13,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 DPADD=	${LIBNTP} ${LIBMD}
 LDADD=	${LIBNTP} -lmd
 
-.if !defined(NO_GNU)
+.if ${MK_GNU_SUPPORT} != "no"
 DPADD+=		${LIBREADLINE} ${LIBTERMCAP}
 LDADD+=		-lreadline -ltermcap
 CFLAGS+=	-DHAVE_LIBREADLINE -DHAVE_READLINE_HISTORY_H \
diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile
index e74b5dc..d4a0baf 100644
--- a/usr.sbin/pkg_install/Makefile
+++ b/usr.sbin/pkg_install/Makefile
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=	lib add create delete info ${_sign} version
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 _sign=	sign
 .endif
 
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index e27d31a..bff3474 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIBINSTALL=	${.OBJDIR}/../lib/libinstall.a
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \
+.if ${MK_OPENSSL} != "no" && \
     defined(LDADD) && ${LDADD:M-lfetch} != ""
 DPADD+=		${LIBSSL} ${LIBCRYPTO}
 LDADD+=		-lssl -lcrypto
diff --git a/usr.sbin/portsnap/portsnap/portsnap.sh b/usr.sbin/portsnap/portsnap/portsnap.sh
index 75772f6..d70d7b3 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.sh
+++ b/usr.sbin/portsnap/portsnap/portsnap.sh
@@ -318,7 +318,7 @@ update_check_params() {
 # We also ignore the Port field, since we are always going to use port 80.
 fetch_pick_server() {
 # Check that host(1) exists (i.e., that the system wasn't built with the
-# NO_BIND flag set) and don't try to find a mirror if it doesn't exist.
+# WITHOUT_BIND set) and don't try to find a mirror if it doesn't exist.
 	if ! which -s host; then
 		return
 	fi
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 007e5e1..ea8a462 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	ppp
 MAN=	ppp.8
 SRCS=	acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c \
@@ -21,13 +23,13 @@ PPP_NO_RADIUS=
 PPP_NO_SUID=
 .endif
 
-.if defined(NO_ATM)
+.if ${MK_ATM} == "no"
 PPP_NO_ATM=
 .endif
-.if defined(NO_I4B)
+.if ${MK_I4B} == "no"
 PPP_NO_I4B=
 .endif
-.if defined(NO_PAM)
+.if ${MK_PAM_SUPPORT} == "no"
 PPP_NO_PAM=
 .endif
 
@@ -58,7 +60,7 @@ CFLAGS+=-DPPP_CONFDIR=\"${PPP_CONFDIR}\"
 CFLAGS+=-DNOKLDLOAD
 .endif
 
-.if defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} == "no"
 CFLAGS+=-DNOINET6
 .endif
 
@@ -82,7 +84,7 @@ CFLAGS+=-DNOSUID
 SRCS+=	id.c
 .endif
 
-.if defined(RELEASE_CRUNCH) || defined(NO_CRYPT) || defined(NO_OPENSSL) || \
+.if defined(RELEASE_CRUNCH) || ${MK_OPENSSL} == "no" || \
     defined(PPP_NO_DES)
 CFLAGS+=-DNODES
 .else
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index c7b6174..3a09d27 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # I once used this extensively, but no longer have a modem.  Feel free
 # to ask me questions about it, but I disclaim ownership now.  -Peter
 
@@ -30,7 +32,7 @@ DPADD+=	${LIBPCAP}
 LDADD+=	-lpcap
 
 # MS-CHAP support.  Requires the DES library.
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
 CFLAGS+= -DCHAPMS
 SRCS+=	chap_ms.c
 LDADD+=	-lcrypto
diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index 6d87b63..3251378 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -1,6 +1,7 @@
 #	$NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $
 # $FreeBSD$
 
+.include <bsd.own.mk>
 
 PROG=	rpcbind
 MAN=	rpcbind.8
@@ -9,7 +10,7 @@ SRCS=	check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
 
 CFLAGS+= -DPORTMAP -DLIBWRAP
 
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
 .endif
 
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index b5874d3..458000b 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.8 (Berkeley) 3/28/97
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 SMDIR=	${SENDMAIL_DIR}/src
 .PATH: ${SMDIR}
@@ -28,7 +30,7 @@ BINMODE=2555
 # Define the database format to use for aliases et al.
 DBMDEF=	-DNEWDB
 # If you don't want NIS alias/map support, comment out this line
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 NIS=	-DNIS
 .endif
 # Map extensions
@@ -38,7 +40,7 @@ CSTD?=	c89
 CFLAGS+= -I${SMDIR} -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
 
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DNETINET6
 .endif
 
@@ -57,7 +59,7 @@ LDADD+=	${LIBSMUTIL} ${LIBSM}
 SRCS+=	sm_os.h
 CLEANFILES+=sm_os.h
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
 # STARTTLS support
 CFLAGS+=	-DSTARTTLS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL
 DPADD+=		${LIBSSL} ${LIBCRYPTO}
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index a943651..2936984 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../contrib/tcp_wrappers
 
 PROG=	tcpdchk
@@ -9,7 +11,7 @@ SRCS=	tcpdchk.c fakelog.c inetcf.c scaffold.c
 CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DPROCESS_OPTIONS \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\"
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
 
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index 2370e9c..cbd61aa 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../contrib/tcp_wrappers
 
 PROG=	tcpdmatch
@@ -8,7 +10,7 @@ SRCS=	tcpdmatch.c fakelog.c inetcf.c scaffold.c
 
 CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
 
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 8cce9cc..71ab9ce 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump
 .PATH: ${TCPDUMP_DISTDIR}
 
@@ -35,7 +37,7 @@ CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR}
 CFLAGS+= -DHAVE_CONFIG_H
 CFLAGS+= -D_U_="__attribute__((unused))"
 
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 SRCS+=	print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c \
 	print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-mobility.c
 CFLAGS+=	-DINET6
@@ -46,7 +48,7 @@ CFLAGS+=	-DLBL_ALIGN
 
 DPADD=	${LIBL} ${LIBPCAP}
 LDADD=	-ll -lpcap
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
 DPADD+= ${LIBCRYPTO}
 LDADD+= -lcrypto
 CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 62ecde8..0348fdb 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 WPA_SUPPLICANT_DISTDIR?= ${.CURDIR}/../../../contrib/wpa_supplicant
 .PATH: ${.CURDIR}/.. ${WPA_SUPPLICANT_DISTDIR}
 
@@ -23,11 +25,11 @@ LDADD+=	-lpcap
 SRCS+=	config_file.c base64.c
 CFLAGS+=-DCONFIG_BACKEND_FILE
 
-.if !defined(NO_WPA_SUPPLICANT_EAPOL)
+.if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
 SRCS+=	eapol_sm.c eap.c
 CFLAGS+= -DIEEE8021X_EAPOL
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
 CFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_LEAP -DEAP_PSK \
 	-DEAP_TLV -DEAP_TLS_FUNCS
 SRCS+=	eap_tls.c eap_peap.c eap_mschapv2.c eap_leap.c \