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)

Makefile.inc1

@@ -2,20 +2,10 @@
 # $FreeBSD$
 #
 # Make command line options:
-#	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
-#	-DNO_KERBEROS Do not build Heimdal (Kerberos 5)
-#	-DNO_RESCUE do not build rescue binaries
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNO_CLEAN do not clean at all
-#	-DNO_CRYPT will prevent building of crypt versions
-#	-DNO_MAN do not build the manual pages
-#	-DNO_NLS do not build Native Language Support files
 #	-DNO_PROFILE do not build profiled libraries
-#	-DNO_GAMES do not go into games subdir
 #	-DNO_SHARE do not go into share subdir
-#	-DNO_INFO do not make or install info files
-#	-DNO_LIBC_R do not build libc_r.
-#	-DNO_FORTRAN do not build g77 and related libraries.
 #	-DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
 #	-DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
 #	-DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
@@ -34,6 +24,8 @@
 # /usr/share/mk.  These include:
 #		obj depend all install clean cleandepend cleanobj
 
+.include <bsd.own.mk>
+
 # We must do share/info early so that installation of info `dir'
 # entries works correctly.  Do it first since it is less likely to
 # grow dependencies on include and lib than vice versa.
@@ -46,18 +38,18 @@
 # We must do etc last for install/distribute to work.
 #
 SUBDIR=	share/info include lib libexec bin
-.if !defined(NO_GAMES)
+.if ${MK_GAMES} != "no"
 SUBDIR+=games
 .endif
 SUBDIR+=gnu
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
 SUBDIR+=kerberos5
 .endif
-.if !defined(NO_RESCUE)
+.if ${MK_RESCUE} != "no"
 SUBDIR+=rescue
 .endif
 SUBDIR+=sbin
-.if !defined(NO_CRYPT)
+.if ${MK_CRYPT} != "no"
 SUBDIR+=secure
 .endif
 .if !defined(NO_SHARE)
@@ -186,8 +178,9 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
-		-DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_NLS -DNO_PIC \
+		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-		-DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS
+		-DWITHOUT_NLS -DNO_PIC -DNO_PROFILE -DNO_SHARED \
+		-DNO_CPU_CFLAGS -DNO_WARNS
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -196,7 +189,8 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS
 
 # cross-tools stage
-XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB
+XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
+		-DWITHOUT_FORTRAN -DWITHOUT_GDB
 
 # world stage
 WMAKEENV=	${CROSSENV} \
@@ -241,7 +235,8 @@ LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		SHLIBDIR=/usr/lib32
 
 LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-		-DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML
+		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \
+		-DWITHOUT_HTML
 LIB32IMAKE=	${LIB32MAKE:NINSTALL=*} -DNO_INCS
 .endif
 
@@ -318,7 +313,7 @@ _worldtmp:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${WORLDTMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if defined(WITH_BIND_LIBS) && !defined(NO_BIND)
+.if ${MK_BIND_LIBS} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
 	    -p ${WORLDTMP}/usr/include >/dev/null
 .endif
@@ -375,8 +370,8 @@ _libraries:
 	@echo ">>> stage 4.2: building libraries"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
-	    ${WMAKE} -DNO_FSCHG -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN \
+	    ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-	    -DNO_NLS -DNO_PROFILE libraries
+	    -DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -405,7 +400,7 @@ build32:
 	    -p ${LIB32TMP}/usr/include >/dev/null
 	mkdir -p ${WORLDTMP}
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
 .for _t in obj depend all
 	cd ${.CURDIR}/kerberos5/tools; \
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= ${_t}
@@ -418,11 +413,11 @@ build32:
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 	cd ${.CURDIR}/gnu/lib; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
-.if !defined(NO_CRYPT)
+.if ${MK_CRYPT} != "no"
 	cd ${.CURDIR}/secure/lib; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endif
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
 	cd ${.CURDIR}/kerberos5/lib; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endif
@@ -450,7 +445,7 @@ distribute32 install32:
 .endif
 	cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 	cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
-.if !defined(NO_CRYPT)
+.if ${MK_CRYPT} != "no"
 	cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
@@ -507,11 +502,11 @@ installcheck_DESTDIR:
 #
 CHECK_UIDS=
 CHECK_GIDS=	audit
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 CHECK_UIDS+=	smmsp
 CHECK_GIDS+=	smmsp
 .endif
-.if !defined(NO_PF)
+.if ${MK_PF} != "no"
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
 .endif
@@ -782,11 +777,11 @@ legacy:
 #
 # bootstrap-tools: Build tools needed for compatibility
 #
-.if !defined(NO_GAMES)
+.if ${MK_GAMES} != "no"
 _strfile=	games/fortune/strfile
 .endif
 
-.if !defined(NO_CXX)
+.if ${MK_CXX} != "no"
 _gperf=		gnu/usr.bin/gperf
 .if ${BOOTSTRAPPING} < 700004
 _groff=		gnu/usr.bin/groff
@@ -815,7 +810,7 @@ _gencat=	usr.bin/gencat
 _mklocale=	usr.bin/mklocale
 .endif
 
-.if !defined(NO_RESCUE) && \
+.if ${MK_RESCUE} != "no" && \
     ${BOOTSTRAPPING} < 600008
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
@@ -865,11 +860,11 @@ _aicasm= sys/modules/aic7xxx/aicasm
 _share=	share/syscons/scrnmaps
 .endif
 
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
 _kerberos5_tools= kerberos5/tools
 .endif
 
-.if !defined(NO_RESCUE)
+.if ${MK_RESCUE} != "no"
 _rescue= rescue/rescue
 .endif
 
@@ -906,7 +901,7 @@ build-tools:
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif
-.if !defined(NO_RESCUE) || defined(RELEASEDIR)
+.if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
 _crunchide=	usr.sbin/crunch/crunchide
 .endif
 .if ${TARGET_ARCH} == "alpha"
@@ -969,7 +964,7 @@ _prebuild_libs=
 
 _generic_libs=	gnu/lib
 
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
 _prebuild_libs+=	kerberos5/lib/libasn1
 _prebuild_libs+=	kerberos5/lib/libkrb5
 _prebuild_libs+=	kerberos5/lib/libroken
@@ -987,14 +982,14 @@ lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
 _generic_libs+=	lib
 
-.if !defined(NO_CRYPT)
+.if ${MK_CRYPT} != "no"
-.if !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 _prebuild_libs+=	secure/lib/libcrypto secure/lib/libssl
 lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 _prebuild_libs+=	secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS} != "no"
 secure/lib/libssh__L: lib/libgssapi__L
 .endif
 .endif
@@ -1002,11 +997,11 @@ secure/lib/libssh__L: lib/libgssapi__L
 _generic_libs+=	secure/lib
 .endif
 
-.if defined(NO_CRYPT) || defined(NO_OPENSSL)
+.if ${MK_OPENSSL} == "no"
 lib/libradius__L: lib/libmd__L
 .endif
 
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 _prebuild_libs+=	lib/libypclnt
 .endif
 

bin/Makefile

@@ -1,6 +1,8 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR= cat \
 	chflags \
 	chio \
@@ -37,15 +39,15 @@ SUBDIR= cat \
 	sync \
 	test
 
-.if !defined(NO_RCMDS)
+.if ${MK_RCMDS} != "no"
 _rcp=	rcp
 .endif
 
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 _rmail=	rmail
 .endif
 
-.if !defined(NO_TCSH)
+.if ${MK_TCSH} != "no"
 _csh=	csh
 .endif
 

bin/Makefile.inc

@@ -1,9 +1,11 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BINDIR?=	/bin
 WARNS?=		6
 
-.if defined(NO_DYNAMICROOT)
+.if ${MK_DYNAMICROOT} == "no"
 NO_SHARED?=	YES
 .endif

bin/csh/Makefile

@@ -6,6 +6,8 @@
 #
 # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
 
+.include <bsd.own.mk>
+
 TCSHDIR= ${.CURDIR}/../../contrib/tcsh
 .PATH: ${TCSHDIR}
 
@@ -45,7 +47,7 @@ LINKS=	${BINDIR}/csh ${BINDIR}/tcsh
 
 CLEANFILES= ${GENHDRS} gethost csh.1
 
-.if !defined(NO_EXAMPLES)
+.if ${MK_EXAMPLES} != "no"
 FILESDIR= ${SHAREDIR}/examples/tcsh
 FILES= complete.tcsh csh-mode.el
 .endif
@@ -70,7 +72,7 @@ NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
 NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15
 NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15
 
-.if defined(NO_NLS_CATALOGS) || defined(RESCUE)
+.if ${MK_NLS_CATALOGS} == "no" || defined(RESCUE)
 CFLAGS+= -DNO_NLS_CATALOGS
 .else
 CFLAGS+= -DHAVE_ICONV

bin/ed/Makefile

@@ -1,11 +1,13 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 CFLAGS+=-DDES
 WARNS?=	2
 DPADD=	${LIBCRYPTO}

contrib/bind9/FREEBSD-Upgrade

@@ -56,7 +56,7 @@
 
    Note that we intentionally disable IPv6 support on the configure
    command line; src/lib/bind/config.mk will re-enable it at compile
-   time if NO_INET6 is not defined.
+   time if WITHOUT_INET6 is not defined.
 
 8) Copy the following generated files to src/lib/bind and commit them:
 

crypto/openssh/FREEBSD-upgrade

@@ -46,7 +46,7 @@
 
    Note that we don't want to configure OpenSSH for Kerberos using
    configure since we have to be able to turn it on or off depending
-   on the value of NO_KERBEROS.  Our Makefiles take care of this.
+   on the value of MK_KERBEROS.  Our Makefiles take care of this.
 
 8) Commit the resulting config.h.  Make sure you don't accidentally
    commit any other files created by autoconf, autoheader or

etc/Makefile

@@ -1,7 +1,9 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
 # $FreeBSD$
 
-.if !defined(NO_SENDMAIL)
+.include <bsd.own.mk>
+
+.if ${MK_SENDMAIL} != "no"
 SUBDIR=	sendmail
 .endif
 
@@ -29,16 +31,16 @@ BSM_ETC_RESTRICTED_FILES=	${OPENBSMDIR}/etc/audit_control \
 BSM_ETC_EXEC_FILES=		${OPENBSMDIR}/etc/audit_warn
 BSM_ETC_DIR=			${DESTDIR}/etc/security
 
-.if !defined(NO_LPR)
+.if ${MK_LPR} != "no"
 BIN1+=	printcap
 .endif
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSH} != "no"
-.if !defined(NO_OPENSSH)
 SSH=	${.CURDIR}/../crypto/openssh/ssh_config \
 	${.CURDIR}/../crypto/openssh/sshd_config \
 	${.CURDIR}/../crypto/openssh/moduli
 .endif
+.if ${MK_OPENSSL} != "no"
 SSL=	${.CURDIR}/../crypto/openssl/apps/openssl.cnf
 .endif
 
@@ -47,24 +49,24 @@ BIN2=	netstart pccard_ether rc.suspend rc.resume
 
 MTREE=	BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
 	BSD.var.dist BSD.x11.dist BSD.x11-4.dist
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 MTREE+=	BSD.sendmail.dist
 .endif
-.if !defined(NO_BIND)
+.if ${MK_BIND} != "no"
 MTREE+=	BIND.chroot.dist
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 MTREE+=	BIND.include.dist
 .endif
 .endif
 
-.if !defined(NO_BIND_ETC) && !defined(NO_BIND)
+.if ${MK_BIND_ETC} != "no"
 NAMEDB=	PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \
 	make-localhost
 .endif
 
 PPPCNF=	ppp.conf
 
-.if defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} == "no"
 ETCMAIL=mailer.conf aliases
 .else
 ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
@@ -75,7 +77,7 @@ ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
 FREEBSD=COPYRIGHT
 
 afterinstall:
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
 	cd ${.CURDIR}/../share/man; ${MAKE} makedb
 .endif
 
@@ -125,21 +127,21 @@ distribution:
 	    ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR}
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
 	    ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
-.if !defined(NO_I4B)
+.if ${MK_I4B} != "no"
 	cd ${.CURDIR}/isdn; ${MAKE} install
 .endif
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 	cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSH} != "no"
-.if !defined(NO_OPENSSH)
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${SSH} ${DESTDIR}/etc/ssh
 .endif
+.if ${MK_OPENSSL} != "no"
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${SSL} ${DESTDIR}/etc/ssl
 .endif
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS} != "no"
 	cd ${.CURDIR}/root; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.k5login ${DESTDIR}/root/.k5login;
@@ -156,17 +158,15 @@ distribution:
 	    ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
-.if !defined(NO_BIND)
+.if ${MK_BIND_ETC} != "no"
-.if !defined(NO_BIND_ETC)
 	cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${NAMEDB} ${DESTDIR}/var/named/etc/namedb
 .endif
-.if !defined(NO_BIND_MTREE)
+.if ${MK_BIND_MTREE} != "no"
 	@if [ ! -e ${DESTDIR}/etc/namedb ]; then \
 		set -x; \
 		ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
 	fi
-.endif
 .endif
 	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    ${PPPCNF} ${DESTDIR}/etc/ppp
@@ -195,17 +195,15 @@ distrib-dirs:
 	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
 	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
-.if !defined(NO_BIND)
+.if ${MK_BIND_LIBS} != "no"
-.if defined(WITH_BIND_LIBS)
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
 	    -p ${DESTDIR}/usr/include
 .endif
-.if !defined(NO_BIND_MTREE)
+.if ${MK_BIND_MTREE} != "no"
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \
 	    -p ${DESTDIR}/var/named
 .endif
-.endif
+.if ${MK_SENDMAIL} != "no"
-.if !defined(NO_SENDMAIL)
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
 .endif
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys

etc/hosts.allow

@@ -37,7 +37,7 @@ ALL : PARANOID : RFC931 20 : deny
 # Allow anything from localhost.  Note that an IP address (not a host
 # name) *MUST* be specified for rpcbind(8).
 ALL : localhost 127.0.0.1 : allow
-# Comment out next line if you build libwrap with NO_INET6=yes.
+# Comment out next line if you build libwrap without IPv6 support.
 ALL : [::1] : allow
 ALL : my.machine.example.com 192.0.2.35 : allow
 

etc/mtree/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 FILES=	${_BIND.chroot.dist} \
 	${_BIND.include.dist} \
 	BSD.include.dist \
@@ -10,9 +12,9 @@ FILES=	${_BIND.chroot.dist} \
 	BSD.x11-4.dist \
 	BSD.x11.dist
 
-.if !defined(NO_BIND)
+.if ${MK_BIND} != "no"
 _BIND.chroot.dist=	BIND.chroot.dist
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 _BIND.include.dist=	BIND.include.dist
 .endif
 .endif

etc/rc.d/Makefile

@@ -1,6 +1,8 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	abi accounting addswap adjkerntz amd \
 	apm apmd archdep atm1 atm2 atm3 auditd \
@@ -41,7 +43,7 @@ FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	ypbind yppasswdd ypserv \
 	ypset ypupdated ypxfrd
 
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 FILES+=	sshd
 .endif
 

games/factor/Makefile

@@ -1,11 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	factor
 SRCS=	factor.c pr_tbl.c
 CFLAGS+=-I${.CURDIR}/../primes
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 CFLAGS+=-DHAVE_OPENSSL
 DPADD=	${LIBCRYPTO}
 LDADD=	-lcrypto

gnu/lib/Makefile

@@ -1,18 +1,20 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR= csu libgcc libgcov libdialog libregex libreadline
 
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.
-.if !defined(NO_CXX)
+.if ${MK_CXX} != "no"
 SUBDIR+= libstdc++ libsupc++
 .endif
 
-.if !defined(NO_OBJC)
+.if ${MK_OBJC} != "no"
 SUBDIR+= libobjc
 .endif
 
-.if !defined(NO_FORTRAN)
+.if ${MK_FORTRAN} != "no"
 SUBDIR+= libg2c
 .endif
 

gnu/lib/libdialog/Makefile

@@ -1,6 +1,8 @@
 # Makefile for libdialog
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=    dialog
 INCS=	dialog.h
 MAN=	dialog.3
@@ -20,7 +22,7 @@ CFLAGS+= -I${.CURDIR} -Wall -Wstrict-prototypes -DLOCALE
 DPADD=	${LIBNCURSES}
 LDADD=	-lncurses
 
-.if !defined(NO_HTML)
+.if ${MK_HTML} != "no"
 FILES=	${EXAMPLES:C;^;${.CURDIR}/TESTS/;}
 FILESDIR= ${SHAREDIR}/examples/libdialog
 .endif

gnu/usr.bin/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR= bc \
 	${_binutils} \
 	${_cc} \
@@ -23,38 +25,38 @@ SUBDIR= bc \
 	${_texinfo}
  
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc"
-NO_GDB=	# not yet
+MK_GDB=	no	# not yet
 .endif
 
-.if !defined(NO_CXX)
+.if ${MK_CXX} != "no"
 .if ${MACHINE_ARCH} != "powerpc"
 _gperf=		gperf
 .endif
-.if !defined(NO_GROFF)
+.if ${MK_GROFF} != "no"
 _groff=		groff
 .endif
 .endif
 
-.if !defined(NO_CVS)
+.if ${MK_CVS} != "no"
 _cvs=		cvs
 .endif
 
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
 _man=		man
 .endif
 
-.if !defined(NO_INFO)
+.if ${MK_INFO} != "no"
 _texinfo=	texinfo
 .endif
 
-.if !defined(NO_TOOLCHAIN)
+.if ${MK_TOOLCHAIN} != "no"
 _binutils=	binutils
 _cc=		cc
-.if !defined(NO_GDB)
+.if ${MK_GDB} != "no"
 _gdb=		gdb
 .endif
 .endif
-.if !defined(NO_RCS)
+.if ${MK_RCS} != "no"
 _rcs=		rcs
 .endif
 

gnu/usr.bin/bc/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BCDIR=	${.CURDIR}/../../../contrib/bc
 .PATH: ${BCDIR}/bc ${BCDIR}/lib ${BCDIR}/doc ${BCDIR}/Examples
 
@@ -11,7 +13,7 @@ CFLAGS+=-DHAVE_CONFIG_H
 DPADD=	${LIBREADLINE} ${LIBTERMCAP}
 LDADD=	-lreadline -ltermcap
 
-.if !defined (NO_EXAMPLES)
+.if ${MK_EXAMPLES} != "no"
 FILES=	ckbook.b pi.b primes.b twins.b
 FILESDIR=	${SHAREDIR}/examples/bc
 .endif

gnu/usr.bin/cc/Makefile

@@ -1,30 +1,32 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
 
 SUBDIR= cc_tools cc_int cc cc1 include protoize doc
 
-.if !defined(NO_CPP)
+.if ${MK_CPP} != "no"
 SUBDIR+= cpp
 .endif
 
-.if !defined(NO_CXX)
+.if ${MK_CXX} != "no"
 SUBDIR+= cc1plus c++ c++filt
-.if !defined(NO_COLLECT2)
+.if ${MK_COLLECT2} != "no"
 #SUBDIR+= collect2
 .endif
 .endif
 
-.if !defined(NO_OBJC)
+.if ${MK_OBJC} != "no"
 SUBDIR+= cc1obj
 .endif
 
-.if !defined(NO_FORTRAN)
+.if ${MK_FORTRAN} != "no"
 SUBDIR+= f77 f771 f77doc
 .endif
 
-.if !defined(NO_GCOV)
+.if ${MK_GCOV} != "no"
 SUBDIR+= gcov
 .endif
 

gnu/usr.bin/cc/cc_tools/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 #
 # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
 # is such a !@#!*#% nightmare because of how it reprograms the dependencies,
@@ -197,7 +199,7 @@ CLEANFILES+=	gt-*.h gtype-*.h
 #-----------------------------------------------------------------------
 # Fortran build tools
 
-.if !defined(NO_FORTRAN)
+.if ${MK_FORTRAN} != "no"
 gen-time-stamp: fini
 fini: fini.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
@@ -295,15 +297,15 @@ GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h $(srcdir)/cpplib.h \
 #
 GTFILES_LANG_DIR_NAMES=
 
-.if !defined(NO_CXX)
+.if ${MK_CXX} != "no"
 GTFILES_LANG_DIR_NAMES+=	cp
 .endif
 
-.if !defined(NO_OBJC)
+.if ${MK_OBJC} != "no"
 GTFILES_LANG_DIR_NAMES+=	objc
 .endif
 
-.if !defined(NO_FORTRAN)
+.if ${MK_FORTRAN} != "no"
 GTFILES_LANG_DIR_NAMES+=	f
 .endif
 

gnu/usr.bin/cvs/cvs/Makefile

@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${CVSDIR}/src
@@ -31,7 +32,7 @@ CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \
 DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
 LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
 
-.if !defined(NO_KERBEROS) && !defined(NO_OPENSSL) && !defined(NO_CRYPT)
+.if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
 LDADD+= -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
 DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}

gnu/usr.bin/dialog/Makefile

@@ -1,7 +1,9 @@
 # Makefile for dialog
 # $FreeBSD$
 
-.if !defined (NO_EXAMPLES)
+.include <bsd.own.mk>
+
+.if ${MK_EXAMPLES} != "no"
 SUBDIR=	TESTS
 .endif
 

include/Makefile

@@ -3,6 +3,8 @@
 #
 # Doing a "make install" builds /usr/include.
 
+.include <bsd.own.mk>
+
 CLEANFILES= osreldate.h version vers.c
 SUBDIR= arpa gssapi protocols rpcsvc rpc
 INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
@@ -51,15 +53,15 @@ LSUBDIRS=	cam/scsi \
 	security/mac_mls security/mac_partition \
 	ufs/ffs ufs/ufs
 
-.if !defined(NO_GPIB)
+.if ${MK_GPIB} != "no"
 _dev_ieee488=	dev/ieee488
 .endif
 
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD} != "no"
 INCS+=	hesiod.h
 .endif
 
-.if !defined(NO_BLUETOOTH)
+.if ${MK_BLUETOOTH} != "no"
 LSUBSUBDIRS=	netgraph/bluetooth/include
 .endif
 
@@ -115,7 +117,7 @@ compat:
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
 	    -f ${.CURDIR}/../etc/mtree/BSD.include.dist \
 	    -p ${DESTDIR}${INCLUDEDIR}
-.if defined(WITH_BIND_LIBS) && !defined(NO_BIND)
+.if ${MK_BIND_LIBS} != "no"
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
 	    -f ${.CURDIR}/../etc/mtree/BIND.include.dist \
 	    -p ${DESTDIR}${INCLUDEDIR}
@@ -145,7 +147,7 @@ copies:
 	cd ${.CURDIR}/../sys/contrib/altq/altq; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
 	    ${DESTDIR}${INCLUDEDIR}/altq
-.if !defined(NO_IPFILTER)
+.if ${MK_IPFILTER} != "no"
 	cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
 	    ${DESTDIR}${INCLUDEDIR}/netinet
@@ -217,7 +219,7 @@ symlinks:
 		ln -fs ../../../sys/contrib/altq/altq/$$h \
 		    ${DESTDIR}${INCLUDEDIR}/altq; \
 	done
-.if !defined(NO_IPFILTER)
+.if ${MK_IPFILTER} != "no"
 	cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
 	for h in *.h; do \
 		ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \

kerberos5/Makefile

@@ -21,11 +21,11 @@ kerberize:
 dekerberize:
 .for entry in ${KPROGS}
 	cd ${.CURDIR}/../${entry}; \
-	${MAKE} -DNO_KERBEROS cleandir; \
+	${MAKE} -DWITHOUT_KERBEROS cleandir; \
-	${MAKE} -DNO_KERBEROS obj; \
+	${MAKE} -DWITHOUT_KERBEROS obj; \
-	${MAKE} -DNO_KERBEROS depend; \
+	${MAKE} -DWITHOUT_KERBEROS depend; \
-	${MAKE} -DNO_KERBEROS all; \
+	${MAKE} -DWITHOUT_KERBEROS all; \
-	${MAKE} -DNO_KERBEROS install
+	${MAKE} -DWITHOUT_KERBEROS install
 .endfor
 
 .include <bsd.subdir.mk>

lib/Makefile

@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
 #
@@ -44,16 +46,16 @@ _csu=csu/${MACHINE_ARCH}
 _csu=csu
 .endif
 
-.if !defined(NO_ATM)
+.if ${MK_ATM} != "no"
 _libatm=	libatm
 _libngatm=	libngatm
 .endif
 
-.if !defined(NO_BIND)
+.if ${MK_BIND} != "no"
 _bind=		bind
 .endif
 
-.if !defined(NO_BLUETOOTH)
+.if ${MK_BLUETOOTH} != "no"
 _libbluetooth=	libbluetooth
 _libsdp=	libsdp
 .endif
@@ -65,7 +67,7 @@ _libvgl=	libvgl
 .endif
 
 .if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \
-    ${MACHINE_ARCH} != "powerpc" && !defined(NO_LIBC_R)
+    ${MACHINE_ARCH} != "powerpc" && ${MK_LIBC_R} != "no"
 _libc_r=
 .endif
 
@@ -73,14 +75,14 @@ _libc_r=
 _libio=		libio
 .endif
 
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 _libmilter=	libmilter
 _libsm=		libsm
 _libsmdb=	libsmdb
 _libsmutil=	libsmutil
 .endif
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 _libmp=		libmp
 .endif
 
@@ -93,11 +95,11 @@ _libsmb=	libsmb
 _libsmb=	libsmb
 .endif
 
-.if !defined(NO_LIBPTHREAD)
+.if ${MK_LIBPTHREAD} != "no"
 _libpthread=	libpthread
 .endif
 
-.if !defined(NO_LIBTHR)
+.if ${MK_LIBTHR} != "no"
 _libthr= libthr
 .endif
 
@@ -105,15 +107,15 @@ _libthr= libthr
 _libthread_db= libthread_db
 .endif
 
-.if !defined(NO_USB)
+.if ${MK_USB} != "no"
 _libusbhid=	libusbhid
 .endif
 
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 _libypclnt=	libypclnt
 .endif
 
-.if !defined(NO_GPIB)
+.if ${MK_GPIB} != "no"
 _libgpib=	libgpib
 .endif
 

lib/bind/bind/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+#.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -62,7 +64,7 @@ SRCS+=		herror.c res_comp.c res_data.c \
 		res_mkquery.c res_mkupdate.c res_query.c \
 		res_send.c res_sendsigned.c res_update.c
 
-#.if defined(WITH_BIND_LIBS)
+#.if ${MK_BIND_LIBS} != "no"
 #INCS=		${SRCDIR}/include/isc/assertions.h \
 #		${SRCDIR}/include/isc/ctl.h \
 #		${SRCDIR}/include/isc/dst.h \

lib/bind/bind9/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -14,7 +16,7 @@ SRCS=		check.c getaddresses.c version.c
 
 CFLAGS+=	-I${SRCDIR}/include
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 INCS=		${SRCDIR}/include/bind9/check.h \
 		${SRCDIR}/include/bind9/getaddresses.h \
 		${SRCDIR}/include/bind9/version.h

lib/bind/config.mk

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # BIND version number
 .if defined(BIND_DIR) && exists(${BIND_DIR}/version)
 .include	"${BIND_DIR}/version"
@@ -15,7 +17,7 @@ CFLAGS+=	-DHAVE_CONFIG_H
 CFLAGS+=	-DLIBINTERFACE=${LIBINTERFACE}
 CFLAGS+=	-DLIBREVISION=${LIBREVISION}
 CFLAGS+=	-DLIBAGE=${LIBAGE}
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 SHLIB_MAJOR=	${LIBINTERFACE}
 SHLIB_MINOR=	${LIBINTERFACE}
 .else
@@ -24,17 +26,17 @@ INTERNALLIB=
 .endif
 
 # GSSAPI support is incomplete in 9.3.0
-#.if !defined(NO_KERBEROS)
+#.if ${MK_KERBEROS} != "no"
 #CFLAGS+=	-DGSSAPI
 #.endif
 
 # Enable IPv6 support if available
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=	-DWANT_IPV6
 .endif
 
 # Enable crypto if available
-.if !defined(NO_CRYPT)
+.if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DOPENSSL
 .endif
 
@@ -61,7 +63,7 @@ CFLAGS+=	-I${LIB_BIND_DIR}
 .endif
 
 # Link against BIND libraries
-.if !defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} == "no"
 LIBBIND9=	${LIB_BIND_REL}/bind9/libbind9.a
 CFLAGS+=	-I${BIND_DIR}/lib/bind9/include
 LIBDNS=		${LIB_BIND_REL}/dns/libdns.a
@@ -84,14 +86,14 @@ CFLAGS+=	-I${BIND_DIR}/lib/lwres/unix/include \
 .endif
 BIND_DPADD=	${LIBBIND9} ${LIBDNS} ${LIBISCCC} ${LIBISCCFG} \
 		${LIBISC} ${LIBLWRES}
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 BIND_LDADD=	-lbind9 -ldns -lisccc -lisccfg -lisc -llwres
 .else
 BIND_LDADD=	${BIND_DPADD}
 .endif
 
 # Link against crypto library
-.if !defined(NO_CRYPT)
+.if ${MK_OPENSSL} != "no"
 CRYPTO_DPADD=	${LIBCRYPTO}
 CRYPTO_LDADD=	-lcrypto
 .endif

lib/bind/dns/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -40,7 +42,7 @@ CFLAGS+=	-I${.CURDIR}
 DPADD=		${CRYPTO_DPADD}
 LDADD=		${CRYPTO_LDADD}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 DNSINCS=	${SRCDIR}/include/dns/acl.h \
 		${SRCDIR}/include/dns/adb.h \
 		${SRCDIR}/include/dns/bit.h \

lib/bind/isc/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -38,7 +40,7 @@ SRCS+=		inet_pton.c \
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include
 CFLAGS+=	-I${SRCDIR}/include -I${.CURDIR}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 INCS=		${SRCDIR}/include/isc/app.h \
 		${SRCDIR}/include/isc/assertions.h \
 		${SRCDIR}/include/isc/base64.h \

lib/bind/isccc/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -16,7 +18,7 @@ SRCS=		alist.c base64.c cc.c ccmsg.c \
 
 CFLAGS+=	-I${SRCDIR}/include
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 INCS=		${SRCDIR}/include/isccc/alist.h \
 		${SRCDIR}/include/isccc/base64.h \
 		${SRCDIR}/include/isccc/cc.h \

lib/bind/isccfg/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -14,7 +16,7 @@ SRCS=		log.c namedconf.c parser.c version.c
 
 CFLAGS+=	-I${SRCDIR}/include -I${.CURDIR}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 INCS=		${SRCDIR}/include/isccfg/cfg.h \
 		${SRCDIR}/include/isccfg/grammar.h \
 		${SRCDIR}/include/isccfg/log.h \

lib/bind/lwres/Makefile

@@ -1,13 +1,15 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
 SRCDIR=		${BIND_DIR}/lib/lwres
 
 # Unlike other BIND libs, this should be installed unless the user says NO.
-.if !defined(NO_BIND_LIBS_LWRES)
+.if ${MK_BIND_LIBS_LWRES} != "no"
-WITH_BIND_LIBS=
+MK_BIND_LIBS=	yes
 .endif
 
 .include	"${LIB_BIND_DIR}/config.mk"
@@ -24,7 +26,7 @@ SRCS+=		context.c gai_strerror.c getaddrinfo.c gethost.c \
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 CFLAGS+=	-I${.CURDIR}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 MAN=		lwres.3 lwres_buffer.3 lwres_config.3 lwres_context.3 \
 		lwres_gabn.3 lwres_gai_strerror.3 lwres_getaddrinfo.3 \
 		lwres_gethostent.3 lwres_getipnode.3 lwres_getnameinfo.3 \

lib/libc/Makefile

@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 # $FreeBSD$
-#
+
+.include <bsd.own.mk>
+
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
 # not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
@@ -55,14 +57,14 @@ NOASM=
 .if ${MACHINE_ARCH} == "arm"
 .include "${.CURDIR}/softfloat/Makefile.inc"
 .endif
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .include "${.CURDIR}/yp/Makefile.inc"
 .endif
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD} != "no"
 CFLAGS+= -DHESIOD
 .endif
-.if defined(NO_FP_LIBC)
+.if ${MK_FP_LIBC} == "no"
 CFLAGS+= -DNO_FLOATING_POINT
 .endif
 

lib/libc/net/Makefile.inc

@@ -115,7 +115,7 @@ MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
 	resolver.3 ns_get16.3 resolver.3 ns_get32.3 \
 	resolver.3 ns_put16.3 resolver.3 ns_put32.3
 
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD} != "no"
 SRCS+=	hesiod.c 
 MAN+=	hesiod.3
 .endif

lib/libcrypt/Makefile

@@ -2,6 +2,8 @@
 # $FreeBSD$
 #
 
+.include <bsd.own.mk>
+
 SHLIB_MAJOR=	3
 LIB=		crypt
 SHLIBDIR?=	/lib
@@ -15,7 +17,7 @@ MLINKS=		crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
 CFLAGS+=	-I${.CURDIR}/../libmd -I${.CURDIR}/../libutil
 
 # Pull in the strong crypto, if it is present.
-.if exists(${.CURDIR}/../../secure/lib/libcrypt) && !defined(NO_CRYPT)
+.if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no"
 .PATH:		${.CURDIR}/../../secure/lib/libcrypt
 SRCS+=		crypt-des.c crypt-blowfish.c blowfish.c
 CFLAGS+=	-I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH

lib/libfetch/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=		fetch
 CFLAGS+=	-I.
 CFLAGS+=	-DINET6
@@ -9,7 +11,7 @@ INCS=		fetch.h
 MAN=		fetch.3
 CLEANFILES=	ftperr.h httperr.h
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DWITH_SSL
 DPADD=		${LIBSSL} ${LIBCRYPTO}
 LDADD=		-lssl -lcrypto

lib/libipsec/Makefile

@@ -27,12 +27,14 @@
 #
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	ipsec
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 2
 CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
 

lib/libmilter/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm
 
@@ -7,7 +9,7 @@ CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+=-DNOT_SENDMAIL -Dsm_snprintf=snprintf
 CFLAGS+=-D_THREAD_SAFE
 
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DNETINET6
 .endif
 

lib/libncurses/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 LIB=	ncurses
@@ -253,7 +255,7 @@ SYMLINKS+=libncurses_p.a ${LIBDIR}/libtinfo_p.a
 DOCSDIR= /usr/share/doc/ncurses
 DOCS=	ncurses-intro.html hackguide.html
 
-.if !defined(NO_HTML)
+.if ${MK_HTML} != "no"
 .PATH: ${NCURSES}/doc/html
 FILESGROUPS=	DOCS
 .endif

lib/libpam/modules/modules.inc

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 MODULES		 =
 MODULES		+= pam_chroot
 MODULES		+= pam_deny
@@ -8,7 +10,7 @@ MODULES		+= pam_exec
 MODULES		+= pam_ftpusers
 MODULES		+= pam_group
 MODULES		+= pam_guest
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
 MODULES		+= pam_krb5
 MODULES		+= pam_ksu
 .endif
@@ -24,7 +26,7 @@ MODULES		+= pam_rhosts
 MODULES		+= pam_rootok
 MODULES		+= pam_securetty
 MODULES		+= pam_self
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 MODULES		+= pam_ssh
 .endif
 MODULES		+= pam_tacplus

lib/libpam/modules/pam_unix/Makefile

@@ -34,6 +34,8 @@
 #
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	pam_unix
 SRCS=	pam_unix.c
 MAN=	pam_unix.8
@@ -41,7 +43,7 @@ MAN=	pam_unix.8
 DPADD= ${LIBUTIL} ${LIBCRYPT}
 LDADD= -lutil -lcrypt
 
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 DPADD+= ${LIBYPCLNT}
 LDADD+= -lypclnt

lib/libpcap/Makefile

@@ -1,6 +1,8 @@
 # Makefile for libpcap
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	pcap
 SRCS=	grammar.y tokdefs.h version.h pcap-bpf.c \
 	pcap.c inet.c fad-getad.c gencode.c optimize.c nametoaddr.c \
@@ -15,7 +17,7 @@ LFLAGS+=-Ppcapyy
 CFLAGS+=-DHAVE_CONFIG_H -Dyylval=pcapyylval -I${.CURDIR} -I.
 CFLAGS+=-D_U_="__attribute__((unused))"
 CFLAGS+=-DHAVE_SNPRINTF -DHAVE_VSNPRINTF
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
 

lib/libradius/Makefile

@@ -24,6 +24,8 @@
 #
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=		radius
 SRCS=		radlib.c
 INCS=		radlib.h radlib_vs.h
@@ -31,7 +33,7 @@ CFLAGS+=	-Wall
 SHLIB_MAJOR=	2
 MAN=		libradius.3 radius.conf.5
 
-.if defined(NO_CRYPT) || defined(NO_OPENSSL)
+.if ${MK_OPENSSL} == "no"
 DPADD=		${LIBMD}
 LDADD=		-lmd
 .else

lib/librpcsvc/Makefile

@@ -1,6 +1,8 @@
 #	from: @(#)Makefile    5.10 (Berkeley) 6/24/90
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../include/rpcsvc
 
 LIB=    rpcsvc
@@ -12,7 +14,7 @@ RPCSRCS= klm_prot.x mount.x nfs_prot.x nlm_prot.x rex.x rnusers.x \
 OTHERSRCS=  rnusers.c rstat.c rwall.c
 SECRPCSRCS= secretkey.c xcrypt.c
 
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 OTHERSRCS+= yp_passwd.c yp_update.c
 .endif
 

lib/libsm/Makefile

@@ -1,12 +1,14 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsm
 
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL
 
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DNETINET6
 .endif
 

lib/libtelnet/Makefile

@@ -1,6 +1,8 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 12/15/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 TELNETDIR=	${.CURDIR}/../../contrib/telnet
 .PATH:		${TELNETDIR}/libtelnet
 
@@ -14,10 +16,10 @@ CFLAGS+=	-I${TELNETDIR}
 WARNS?=		0
 
 .if !defined(RELEASE_CRUNCH)
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 SRCS+=		encrypt.c auth.c enc_des.c sra.c pk.c
 CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS_SUPPORT} != "no"
 SRCS+=		kerberos5.c
 CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
 CFLAGS+=	-DFORWARD -Dnet_write=telnet_net_write

lib/libwrap/Makefile

@@ -2,6 +2,8 @@
 # $FreeBSD$
 #
 
+.include <bsd.own.mk>
+
 LIB=	wrap
 SHLIB_MAJOR= 4
 INCS=	tcpd.h
@@ -17,10 +19,10 @@ CFLAGS+=-DFACILITY=LOG_AUTH -DHOSTS_ACCESS -DNETGROUP -DDAEMON_UMASK=022 \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
 	-DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP -DPROCESS_OPTIONS
-.if defined(NO_NIS)
+.if ${MK_NIS} == "no"
 CFLAGS+= -DUSE_GETDOMAIN
 .endif
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
 

lib/ncurses/ncurses/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 LIB=	ncurses
@@ -253,7 +255,7 @@ SYMLINKS+=libncurses_p.a ${LIBDIR}/libtinfo_p.a
 DOCSDIR= /usr/share/doc/ncurses
 DOCS=	ncurses-intro.html hackguide.html
 
-.if !defined(NO_HTML)
+.if ${MK_HTML} != "no"
 .PATH: ${NCURSES}/doc/html
 FILESGROUPS=	DOCS
 .endif

libexec/Makefile

@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=	atrun \
 	bootpd \
 	comsat \
@@ -32,12 +34,12 @@ SUBDIR=	atrun \
 	tftpd \
 	${_ypxfr}
 
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 _mknetid=	mknetid
 _ypxfr=		ypxfr
 .endif
 
-.if !defined(NO_PF)
+.if ${MK_PF} != "no"
 _ftp-proxy=	ftp-proxy
 .endif
 
@@ -45,12 +47,12 @@ _ftp-proxy=	ftp-proxy
 _rtld-elf=	rtld-elf
 .endif
 
-.if !defined(NO_RCMDS)
+.if ${MK_RCMDS} != "no"
 _rlogind=	rlogind
 _rshd=		rshd
 .endif
 
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 _mail.local=	mail.local
 _smrsh=	smrsh
 .endif

libexec/ftpd/Makefile

@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	ftpd
 MAN=	ftpd.8 ftpchroot.5
 SRCS=	ftpd.c ftpcmd.y logwtmp.c popen.c
@@ -26,7 +28,7 @@ CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR}
 DPADD+=	${LIBM}
 LDADD+=	-lm
 
-.if !defined(NO_PAM)
+.if ${MK_PAM_SUPPORT} != "no"
 CFLAGS+=-DUSE_PAM
 DPADD+= ${LIBPAM}
 LDADD+= ${MINUSLPAM}

libexec/lukemftpd/Makefile

@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LUKEMFTPD=	${.CURDIR}/../../contrib/lukemftpd
 .PATH: ${LUKEMFTPD}/src ${LUKEMFTPD}/libnetbsd
 
@@ -30,7 +32,7 @@ CFLAGS+= -DUSE_OPIE -DLOGIN_CAP
 DPADD+=	${LIBOPIE} ${LIBMD}
 LDADD+=	-lopie -lmd
 
-.if !defined(NO_PAM)
+.if ${MK_PAM_SUPPORT} != "no"
 CFLAGS+= -DUSE_PAM
 DPADD+=	${LIBPAM}
 LDADD+=	${MINUSLPAM}

libexec/tcpd/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../contrib/tcp_wrappers
 
 PROG=	tcpd
@@ -9,7 +11,7 @@ CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
 	-DFACILITY=LOG_DAEMON
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
 

libexec/telnetd/Makefile

@@ -3,6 +3,8 @@
 # Do not define -DKLUDGELINEMODE, as it does not interact well with many
 # telnet implementations.
 
+.include <bsd.own.mk>
+
 TELNETDIR=	${.CURDIR}/../../contrib/telnet
 .PATH:		${TELNETDIR}/telnetd
 
@@ -25,12 +27,12 @@ DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
 LDADD=		-lutil -ltermcap ${LIBTELNET}
 
 .if !defined(RELEASE_CRUNCH)
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 SRCS+=		authenc.c
 CFLAGS+=	-DAUTHENTICATION -DENCRYPTION
 DPADD+=		${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM}
 LDADD+=		-lmp -lcrypto -lcrypt ${MINUSLPAM}
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
 DPADD+=		${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR}
 LDADD+=		-lkrb5 -lasn1 -lroken -lcom_err

release/Makefile

@@ -375,8 +375,8 @@ release rerelease:
 .endif
 	mkdir -p ${CHROOTDIR}
 	@echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
-	cd ${WORLDDIR} && ${NATIVEMAKE} -DNO_GAMES -DNO_HTML -DNO_LIB32 \
+	cd ${WORLDDIR} && ${NATIVEMAKE} -DWITHOUT_GAMES -DWITHOUT_HTML -DNO_LIB32 \
-	    -DNO_MAN -DNO_NLS -DNO_PROFILE installworld DESTDIR=${CHROOTDIR}
+	    -DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE installworld DESTDIR=${CHROOTDIR}
 	cd ${WORLDDIR} && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
 	if [ -f /etc/resolv.conf ]; then \
 		cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \

release/picobsd/tinyware/login/Makefile

@@ -1,6 +1,8 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../../../usr.bin/login
 
 PROG=	login
@@ -12,7 +14,7 @@ CFLAGS+=-DLOGIN_ACCESS -DLOGALL
 DPADD=	${LIBUTIL} ${LIBCRYPT}
 LDADD=	-lutil -lcrypt
 
-.if !defined(NO_PAM)
+.if ${MK_PAM_SUPPORT} != "no"
 CFLAGS+= -DUSE_PAM
 DPADD+=	${LIBPAM}
 LDADD+=	${MINUSLPAM}

rescue/librescue/Makefile

@@ -2,6 +2,8 @@
 # $FreeBSD$
 #
 
+.include <bsd.own.mk>
+
 # Certain library entries have hard-coded references to
 # /bin, /sbin, etc, that require those entries to be
 # recompiled for use in /rescue.  This Makefile
@@ -30,10 +32,10 @@ CFLAGS+=	-DPOSIX_MISTAKE
 # libc/rpc/Makefile.inc
 CFLAGS+=	-DBROKEN_DES -DPORTMAP -DDES_BUILTIN
 # libc/Makefile
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 CFLAGS+=       -DYP
 .endif
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD} != "no"
 CFLAGS+=       -DHESIOD
 .endif
 CFLAGS+=	-I${.CURDIR}/../../lib/libc/include

rescue/rescue/Makefile

@@ -1,6 +1,10 @@
 #$FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
+NO_MAN=
+
+.include <bsd.own.mk>
+
 PROG=	rescue
 BINDIR?=/rescue
 
@@ -68,7 +72,7 @@ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo 	\
 	 ed expr getfacl hostname kenv kill ln ls mkdir mv pax ps pwd 	\
 	 realpath rm rmdir setfacl sh stty sync test
 CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lm -ltermcap -lutil
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 CRUNCH_LIBS+= -lcrypto
 .endif
 
@@ -81,11 +85,11 @@ CRUNCH_ALIAS_ln= link
 CRUNCH_ALIAS_rm= unlink
 CRUNCH_ALIAS_ed= red
 
-.if !defined(NO_RCMDS)
+.if ${MK_RCMDS} != "no"
 CRUNCH_PROGS_bin+= rcp
 .endif
 
-.if !defined(NO_TCSH)
+.if ${MK_TCSH} != "no"
 CRUNCH_PROGS_bin+= csh
 CRUNCH_ALIAS_csh= -csh tcsh -tcsh
 CRUNCH_SUPPRESS_LINK_-csh= 1
@@ -114,16 +118,16 @@ CRUNCH_PROGS_sbin= atacontrol badsect bsdlabel		\
 	restore rcorder route routed rtquery rtsol savecore 		\
 	slattach spppcontrol startslip swapon sysctl tunefs umount 
 
-.if !defined(NO_ATM)
+.if ${MK_ATM} != "no"
 CRUNCH_PROGS_sbin+= atm atmconfig fore_dnld ilmid
 CRUNCH_LIBS+= -latm
 .endif
 
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CRUNCH_PROGS_sbin+= ping6
 .endif
 
-.if !defined(NO_IPFILTER)
+.if ${MK_IPFILTER} != "no"
 CRUNCH_PROGS_sbin+= ipf
 .endif
 
@@ -221,7 +225,6 @@ CANONICALOBJDIR:= ${MAKEOBJDIRPREFIX}${.CURDIR}
 CANONICALOBJDIR:= /usr/obj${.CURDIR}
 .endif
 
-NO_MAN=
 CLEANFILES+= $(CONF) *.o *.lo *.c *.mk *.cache *.a *.h
 
 # Program names and their aliases contribute hardlinks to 'rescue' executable,

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

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

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

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

secure/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR= lib libexec usr.bin usr.sbin
 
 # These are the programs which depend on crypto, but not Kerberos.
@@ -7,7 +9,7 @@ SPROGS=	lib/libfetch lib/libpam lib/libradius lib/libtelnet	\
 	bin/ed libexec/telnetd usr.bin/fetch usr.bin/telnet	\
 	usr.sbin/pkg_install usr.sbin/ppp usr.sbin/pppd		\
 	usr.sbin/tcpdump/tcpdump
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 SPROGS+=usr.sbin/sendmail
 .endif
 
@@ -26,11 +28,11 @@ secure:
 insecure:
 .for entry in ${SPROGS}
 	cd ${.CURDIR}/../${entry}; \
-	${MAKE} -DNO_CRYPT cleandir; \
+	${MAKE} -DWITHOUT_CRYPT cleandir; \
-	${MAKE} -DNO_CRYPT obj; \
+	${MAKE} -DWITHOUT_CRYPT obj; \
-	${MAKE} -DNO_CRYPT depend; \
+	${MAKE} -DWITHOUT_CRYPT depend; \
-	${MAKE} -DNO_CRYPT all; \
+	${MAKE} -DWITHOUT_CRYPT all; \
-	${MAKE} -DNO_CRYPT install
+	${MAKE} -DWITHOUT_CRYPT install
 .endfor
 
 .include <bsd.subdir.mk>

secure/Makefile.inc

@@ -1,15 +1,17 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .if exists(${.CURDIR}/../../lib/libcrypt/obj)
 CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt/obj
 .else
 CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt
 .endif
 
-.if !defined(MAKE_IDEA)
+.if ${MK_IDEA} == "no"
 CFLAGS+= -DNO_IDEA
 .endif
 
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 SSHDIR=		${.CURDIR}/../../../crypto/openssh
 .endif

secure/lib/Makefile

@@ -1,9 +1,11 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR= 
-.if !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 SUBDIR+=libcrypto libssl
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 SUBDIR+=libssh
 .endif
 .endif

secure/lib/libcrypto/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=		crypto
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	4
@@ -164,7 +166,7 @@ SRCS+=	hmac.c
 INCS+=	hmac.h
 
 # idea
-.if defined(MAKE_IDEA)
+.if ${MK_IDEA} != "no"
 SRCS+=	i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c
 INCS+=	idea.h
 .endif
@@ -313,7 +315,7 @@ opensslconf.h: opensslconf-${MACHINE_ARCH}.h
 	cp ${.ALLSRC} ${.TARGET}
 
 evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h
-.if !defined(MAKE_IDEA)
+.if ${MK_IDEA} == "no"
 	sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC} > ${.TARGET}
 .else
 	cp ${.ALLSRC} ${.TARGET}
@@ -344,7 +346,7 @@ afterinstall:
 _bn_asmpath=	${LCRYPTO_SRC}/crypto/bn/asm
 .endif
 
-.if defined(MAKE_IDEA)
+.if ${MK_IDEA} != "no"
 _ideapath=	${LCRYPTO_SRC}/crypto/idea
 .endif
 

secure/lib/libcrypto/Makefile.inc

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl
 LCRYPTO_DOC=	${.CURDIR}/../../../crypto/openssl/doc
 
@@ -7,7 +9,7 @@ CFLAGS+=	-DTERMIOS -DANSI_SOURCE
 CFLAGS+=	-I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR}
 CFLAGS+=	-DOPENSSL_THREADS
 
-.if !defined(MAKE_IDEA)
+.if ${MK_IDEA} == "no"
 CFLAGS+=	-DOPENSSL_NO_IDEA
 .endif
 

secure/lib/libssh/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	ssh
 SHLIB_MAJOR=	3
 SRCS=	acss.c authfd.c authfile.c bufaux.c buffer.c \
@@ -30,7 +32,7 @@ CFLAGS+= -I${SSHDIR}
 DPADD=	${LIBZ}
 LDADD=	-lz
 
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
 LDADD+=	-lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken

secure/libexec/Makefile

@@ -1,10 +1,10 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=
-.if !defined(NO_OPENSSL)
+.if ${MK_OPENSSH} != "no"
-.if !defined(NO_OPENSSH)
 SUBDIR+=sftp-server ssh-keysign
 .endif
-.endif
 
 .include <bsd.subdir.mk>

secure/usr.bin/Makefile

@@ -1,9 +1,11 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=
-.if !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 SUBDIR+=bdes openssl
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
 .endif
 .endif

secure/usr.bin/ssh/Makefile

@@ -1,6 +1,8 @@
 # $FreeBSD$
 #
 
+.include <bsd.own.mk>
+
 PROG=	ssh
 CFLAGS+=-I${SSHDIR}
 LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
@@ -14,7 +16,7 @@ SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
 DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ}
 LDADD=	-lssh -lutil -lz
 
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	 ${LIBGSSAPI}
 LDADD+=	 -lgssapi

secure/usr.sbin/Makefile

@@ -1,7 +1,9 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR= 
-.if !defined(NO_OPENSSH) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSH} != "no"
 SUBDIR+=sshd
 .endif
 

secure/usr.sbin/sshd/Makefile

@@ -1,6 +1,8 @@
 # $FreeBSD$
 #
 
+.include <bsd.own.mk>
+
 PROG=	sshd
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	sshpty.c sshlogin.c servconf.c serverloop.c \
@@ -23,13 +25,13 @@ CFLAGS+=-I${SSHDIR}
 DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
 LDADD=	-lssh -lutil -lz -lwrap ${MINUSLPAM}
 
-.if !defined(NO_AUDIT)
+.if ${MK_AUDIT} != "no"
 CFLAGS+= -DUSE_BSM_AUDIT
 DPADD+=  ${LIBBSM}
 LDADD+=  -lbsm
 .endif
 
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	 ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
 LDADD+=	 -lgssapi -lkrb5 -lasn1 -lcom_err -lroken

share/Makefile

@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # Do not include `info' in the SUBDIR list, it is handled separately.
 
 SUBDIR=	${_colldef} \
@@ -25,7 +27,7 @@ SUBDIR=	${_colldef} \
 	${_timedef} \
 	zoneinfo
 
-.if !defined(NO_LOCALES)
+.if ${MK_LOCALES} != "no"
 _colldef =	colldef
 _mklocale =	mklocale
 _monetdef =	monetdef
@@ -34,35 +36,35 @@ _numericdef =	numericdef
 _timedef =	timedef
 .endif
 
-.if !defined(NO_SYSCONS)
+.if ${MK_SYSCONS} != "no"
 _syscons=	syscons
 .endif
 
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
 _man=		man
 .endif
 
-.if !defined(NO_GROFF)
+.if ${MK_GROFF} != "no"
 _me=		me
 .endif
 
-.if !defined(NO_EXAMPLES)
+.if ${MK_EXAMPLES} != "no"
 _examples=	examples
 .endif
 
-.if !defined(NO_I4B)
+.if ${MK_I4B} != "no"
 _isdn=		isdn
 .endif
 
-.if !defined(NO_DICT)
+.if ${MK_DICT} != "no"
 _dict=	 	dict
 .endif
 
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 _sendmail=	 sendmail
 .endif
 
-.if !defined(NO_SHAREDOCS)
+.if ${MK_SHAREDOCS} != "no"
 _doc=		doc
 .endif
 

share/doc/Makefile

@@ -1,9 +1,11 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=	${_bind9} IPv6 papers psd smm usd
 
-.if !defined(NO_BIND)
+.if ${MK_BIND} != "no"
 _bind9=	bind9
 .endif
 

share/doc/smm/Makefile

@@ -1,6 +1,8 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/10/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # The following modules do not describe FreeBSD:
 # 14.uucpimpl, 15.uucpnet
 
@@ -24,7 +26,7 @@ SUBDIR=	title \
 	12.timed \
 	18.net
 
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 _08.sendmailop=	08.sendmailop 
 .endif
 

share/examples/Makefile

@@ -2,6 +2,8 @@
 #
 # Doing a make install builds /usr/share/examples
 
+.include <bsd.own.mk>
+
 LDIRS=	BSD_daemon \
 	FreeBSD_version \
 	IPv6 \
@@ -283,10 +285,10 @@ etc-examples:
 
 .if ${SHARED} != "symlinks"
 SUBDIR=	smbfs
-.if !defined(NO_IPFILTER)
+.if ${MK_IPFILTER} != "no"
 SUBDIR+=ipfilter
 .endif
-.if !defined(NO_PF)
+.if ${MK_PF} != "no"
 SUBDIR+=pf
 .endif
 .endif

share/man/Makefile

@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/16/94
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # XXX MISSING:	man3f
 SUBDIR=	man1 man3 man4 man5 man6 man7 man8 man9
 
@@ -8,7 +10,7 @@ MAKEWHATIS?=	makewhatis
 
 makedb:
 	${MAKEWHATIS} ${DESTDIR}${BINDIR}/man
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 	${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man
 .endif
 

share/man/man3/Makefile

@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/13/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 MAN=		assert.3 \
 		bitstring.3 \
 		end.3 \
@@ -144,7 +146,7 @@ MLINKS+=	tree.3 RB_EMPTY.3 \
 		tree.3 SPLAY_RIGHT.3 \
 		tree.3 SPLAY_ROOT.3
 
-.if !defined(NO_LIBC_R) || !defined(NO_LIBPTHREAD) || !defined(NO_LIBTHR)
+.if ${MK_LIBC_R} != "no" || ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no"
 PTHREAD_MAN=	pthread.3 \
 		pthread_atfork.3 \
 		pthread_attr.3 \

share/man/man5/Makefile

@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 #	$FreeBSD$
 
-.include <bsd.init.mk>
+.include <bsd.own.mk>
 
 #MISSING: dump.5 plot.5
 MAN=	acct.5 \
@@ -69,7 +69,7 @@ MLINKS+=rc.conf.5 rc.conf.local.5
 MLINKS+=resolver.5 resolv.conf.5
 MLINKS+=utmp.5 lastlog.5 utmp.5 wtmp.5
 
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD} != "no"
 MAN+=	hesiod.conf.5 
 .endif
 

share/man/man5/nsswitch.conf.5

@@ -276,7 +276,7 @@ This treats nis as the authoritative source of information, except
 when the server is down.
 .Sh NOTES
 If system got compiled with
-.Va NO_NIS
+.Va WITHOUT_NIS
 you have to remove
 .Sq nis
 entries.

share/mk/bsd.incs.mk

@@ -4,7 +4,7 @@
 .error bsd.incs.mk cannot be included directly.
 .endif
 
-.if !defined(NO_INCS) && !defined(NO_TOOLCHAIN)
+.if !defined(NO_INCS) && ${MK_TOOLCHAIN} != "no"
 
 INCSGROUPS?=	INCS
 
@@ -81,4 +81,4 @@ installincludes:
 realinstall: installincludes
 .ORDER: beforeinstall installincludes
 
-.endif # !defined(NO_INCS) && !defined(NO_TOOLCHAIN)
+.endif # !defined(NO_INCS) && ${MK_TOOLCHAIN} != "no"

share/mk/bsd.info.mk

@@ -53,8 +53,6 @@
 #
 # MAKEINFOFLAGS		Options for ${MAKEINFO} command. [--no-split]
 #
-# NO_INFO	Do not make or install info files. [not set]
-#
 # NO_INFOCOMPRESS	If you do not want info files be
 #			compressed when they are installed. [not set]
 #
@@ -123,7 +121,7 @@ DVIPS2ASCII?=	dvips2ascii
 IFILENS+=	${INFO:S/$/.${_f}/}
 .endfor
 
-.if !defined(NO_INFO)
+.if ${MK_INFO} != "no"
 CLEANFILES+=	${IFILENS}
 .if !defined(NO_INFOCOMPRESS)
 CLEANFILES+=	${IFILENS:S/$/${ICOMPRESS_EXT}/}
@@ -172,7 +170,7 @@ CLEANFILES+=	${INFO:S/$/-la.texi/}
 CLEANFILES+=	${INFO:S/$/.info.*.html/} ${INFO:S/$/.info/}
 .endif
 
-.if !defined(NO_INFO) && defined(INFO)
+.if ${MK_INFO} != "no" && defined(INFO)
 install: ${INSTALLINFODIRS}
 .if !empty(IFILES:N*.html)
 	${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \

share/mk/bsd.lib.mk

@@ -185,7 +185,7 @@ ${SHLIB_NAME}: ${SOBJS}
 	    `lorder ${SOBJS} | tsort -q` ${LDADD}
 .endif
 
-.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && !defined(NO_TOOLCHAIN)
+.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
 _LIBS+=		lib${LIB}_pic.a
 
 lib${LIB}_pic.a: ${SOBJS}
@@ -210,7 +210,7 @@ ${LINTLIB}: ${LINTOBJS}
 
 all: ${_LIBS}
 
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
 all: _manpages
 .endif
 
@@ -272,7 +272,7 @@ _libinstall:
 .endif
 .endif
 .endif
-.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && !defined(NO_TOOLCHAIN)
+.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
 .endif
@@ -287,7 +287,7 @@ _libinstall:
 .include <bsd.incs.mk>
 .include <bsd.links.mk>
 
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
 realinstall: _maninstall
 .ORDER: beforeinstall _maninstall
 .endif
@@ -299,7 +299,7 @@ lint: ${SRCS:M*.c}
 	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC}
 .endif
 
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
 .include <bsd.man.mk>
 .endif
 

share/mk/bsd.libnames.mk

@@ -15,7 +15,7 @@ LIBARCHIVE?=	${DESTDIR}${LIBDIR}/libarchive.a
 LIBASN1?=	${DESTDIR}${LIBDIR}/libasn1.a
 LIBATM?=	${DESTDIR}${LIBDIR}/libatm.a
 LIBBEGEMOT?=	${DESTDIR}${LIBDIR}/libbegemot.a
-.if !defined(NO_BIND) && defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 LIBBIND?=	${DESTDIR}${LIBDIR}/libbind.a
 LIBBIND9?=	${DESTDIR}${LIBDIR}/libbind9.a
 .endif
@@ -54,7 +54,7 @@ LIBHDB?=	${DESTDIR}${LIBDIR}/libhdb.a
 LIBHISTORY?=	${DESTDIR}${LIBDIR}/libhistory.a
 LIBIPSEC?=	${DESTDIR}${LIBDIR}/libipsec.a
 LIBIPX?=	${DESTDIR}${LIBDIR}/libipx.a
-.if !defined(NO_BIND) && defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 LIBISC?=	${DESTDIR}${LIBDIR}/libisc.a
 LIBISCCC?=	${DESTDIR}${LIBDIR}/libisccc.a
 LIBISCCFG?=	${DESTDIR}${LIBDIR}/libisccfg.a
@@ -68,7 +68,7 @@ LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
 LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
 LIBL?=		${DESTDIR}${LIBDIR}/libl.a
 LIBLN?=		"don't use LIBLN, use LIBL"
-.if !defined(NO_BIND)
+.if ${MK_BIND} != "no"
 LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
 .endif
 LIBM?=		${DESTDIR}${LIBDIR}/libm.a
@@ -76,7 +76,7 @@ LIBMAGIC?=	${DESTDIR}${LIBDIR}/libmagic.a
 LIBMD?=		${DESTDIR}${LIBDIR}/libmd.a
 LIBMEMSTAT?=	${DESTDIR}${LIBDIR}/libmemstat.a
 LIBMENU?=	${DESTDIR}${LIBDIR}/libmenu.a
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 LIBMILTER?=	${DESTDIR}${LIBDIR}/libmilter.a
 .endif
 LIBMP?=		${DESTDIR}${LIBDIR}/libmp.a
@@ -93,7 +93,7 @@ LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
 LIBPAM?=	${DESTDIR}${LIBDIR}/libpam.a
 MINUSLPAM=	-lpam
 .if defined(LDFLAGS) && !empty(LDFLAGS:M-static)
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
 LIBPAM+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBROKEN} ${LIBCOM_ERR}
 MINUSLPAM+=	-lkrb5 -lasn1 -lcrypto -lcrypt -lroken -lcom_err
@@ -102,11 +102,11 @@ LIBPAM+=	${LIBRADIUS} ${LIBTACPLUS} ${LIBCRYPT} \
 		${LIBUTIL} ${LIBOPIE} ${LIBMD}
 MINUSLPAM+=	-lradius -ltacplus -lcrypt \
 		-lutil -lopie -lmd
-.if !defined(NO_OPENSSH) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSH} != "no"
 LIBPAM+=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
 MINUSLPAM+=	-lssh -lcrypto -lcrypt
 .endif
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 LIBPAM+=	${LIBYPCLNT}
 MINUSLPAM+=	-lypclnt
 .endif

share/mk/bsd.nls.mk

@@ -18,8 +18,6 @@
 # NLSMODE	National Language Support files mode. [${NOBINMODE}]
 #
 # NLSOWN	National Language Support files owner. [${SHAREOWN}]
-#
-# NO_NLS	Do not make or install NLS files. [not set]
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.nls.mk cannot be included directly.
@@ -32,7 +30,7 @@ GENCAT?=	gencat
 .msg.cat:
 	${GENCAT} ${.TARGET} ${.IMPSRC}
 
-.if defined(NLS) && !empty(NLS) && !defined(NO_NLS)
+.if defined(NLS) && !empty(NLS) && ${MK_NLS} != "no"
 
 #
 # .msg file pre-build rules
@@ -73,4 +71,4 @@ SYMLINKS+=	../${file:R}/${NLSNAME}.cat ${NLSDIR}/${dst}/${NLSNAME}.cat
 .endfor
 .endfor
 
-.endif # defined(NLS) && !empty(NLS) && !defined(NO_NLS)
+.endif # defined(NLS) && !empty(NLS) && ${MK_NLS} != "no"

share/mk/bsd.own.mk

@@ -104,6 +104,9 @@
 .if !target(__<bsd.own.mk>__)
 __<bsd.own.mk>__:
 
+SRCCONF?=	/etc/src.conf
+.sinclude "${SRCCONF}"
+
 # Binaries
 BINOWN?=	root
 BINGRP?=	wheel
@@ -165,4 +168,277 @@ STRIP?=		-s
 COMPRESS_CMD?=	gzip -cn
 COMPRESS_EXT?=	.gz
 
+#
+# Define MK_* variables (which are either "yes" or "no") for users
+# to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the
+# make(1) environment.
+# These should be tested with `== "no"' or `!= "no"' in makefiles.
+# The NO_* variables should only be set by makefiles.
+#
+
+#
+# Supported NO_* options (if defined, MK_* will be forced to "no",
+# regardless of user's setting).
+#
+.for var in \
+    MAN
+.if defined(NO_${var})
+WITHOUT_${var}=
+.endif
+.endfor
+
+#
+# Compat NO_* options (same as above, except their use is deprecated).
+#
+.if !defined(BURN_BRIDGES)
+.for var in \
+    ACPI \
+    ATM \
+    AUDIT \
+    AUTHPF \
+    BIND \
+    BIND_DNSSEC \
+    BIND_ETC \
+    BIND_LIBS_LWRES \
+    BIND_MTREE \
+    BIND_NAMED \
+    BIND_UTILS \
+    BLUETOOTH \
+    BOOT \
+    CALENDAR \
+    COLLECT2 \
+    CPP \
+    CRYPT \
+    CVS \
+    CXX \
+    DICT \
+    DYNAMICROOT \
+    EXAMPLES \
+    FORTH \
+    FORTRAN \
+    FP_LIBC \
+    GAMES \
+    GCOV \
+    GDB \
+    GNU \
+    GPIB \
+    GROFF \
+    HTML \
+    I4B \
+    INET6 \
+    INFO \
+    IPFILTER \
+    IPX \
+    KERBEROS \
+    LIBC_R \
+    LIBPTHREAD \
+    LIBTHR \
+    LOCALES \
+    LPR \
+    MAILWRAPPER \
+    NETCAT \
+    NIS \
+    NLS \
+    NLS_CATALOGS \
+    OBJC \
+    OPENSSH \
+    OPENSSL \
+    PAM \
+    PCVT \
+    PF \
+    RCMDS \
+    RCS \
+    RESCUE \
+    SENDMAIL \
+    SETUID_LOGIN \
+    SHAREDOCS \
+    SYSCONS \
+    TCSH \
+    TOOLCHAIN \
+    USB \
+    WPA_SUPPLICANT_EAPOL
+.if defined(NO_${var})
+#.warning NO_${var} is deprecated in favour of WITHOUT_${var}=
+WITHOUT_${var}=
+.endif
+.endfor
+.endif # !defined(BURN_BRIDGES)
+
+#
+# Older-style variables that enabled behaviour when set.
+#
+.if defined(YES_HESIOD)
+WITH_HESIOD=
+.endif
+.if defined(MAKE_IDEA)
+WITH_IDEA=
+.endif
+
+#
+# MK_* options which default to "yes".
+#
+.for var in \
+    ACPI \
+    ATM \
+    AUDIT \
+    AUTHPF \
+    BIND \
+    BIND_DNSSEC \
+    BIND_ETC \
+    BIND_LIBS_LWRES \
+    BIND_MTREE \
+    BIND_NAMED \
+    BIND_UTILS \
+    BLUETOOTH \
+    BOOT \
+    CALENDAR \
+    COLLECT2 \
+    CPP \
+    CRYPT \
+    CVS \
+    CXX \
+    DICT \
+    DYNAMICROOT \
+    EXAMPLES \
+    FORTH \
+    FORTRAN \
+    FP_LIBC \
+    GAMES \
+    GCOV \
+    GDB \
+    GNU \
+    GPIB \
+    GROFF \
+    HTML \
+    I4B \
+    INET6 \
+    INFO \
+    IPFILTER \
+    IPX \
+    KERBEROS \
+    LIBC_R \
+    LIBPTHREAD \
+    LIBTHR \
+    LOCALES \
+    LPR \
+    MAILWRAPPER \
+    MAN \
+    NETCAT \
+    NIS \
+    NLS \
+    NLS_CATALOGS \
+    OBJC \
+    OPENSSH \
+    OPENSSL \
+    PAM \
+    PCVT \
+    PF \
+    RCMDS \
+    RCS \
+    RESCUE \
+    SENDMAIL \
+    SETUID_LOGIN \
+    SHAREDOCS \
+    SYSCONS \
+    TCSH \
+    TOOLCHAIN \
+    USB \
+    WPA_SUPPLICANT_EAPOL
+.if defined(WITH_${var}) && defined(WITHOUT_${var})
+.error WITH_${var} and WITHOUT_${var} can't both be set.
+.endif
+.if defined(MK_${var})
+.error MK_${var} can't be set by a user.
+.endif
+.if defined(WITHOUT_${var})
+MK_${var}:=	no
+.else
+MK_${var}:=	yes
+.endif
+.endfor
+
+#
+# MK_* options which default to "no".
+#
+.for var in \
+    BIND_LIBS \
+    HESIOD \
+    IDEA
+.if defined(WITH_${var}) && defined(WITHOUT_${var})
+.error WITH_${var} and WITHOUT_${var} can't both be set.
+.endif
+.if defined(MK_${var})
+.error MK_${var} can't be set by a user.
+.endif
+.if defined(WITH_${var})
+MK_${var}:=	yes
+.else
+MK_${var}:=	no
+.endif
+.endfor
+
+#
+# Force some options off if their dependencies are off.
+#
+.if ${MK_BIND} == "no"
+MK_BIND_DNSSEC:= no
+MK_BIND_ETC:=	no
+MK_BIND_LIBS:=	no
+MK_BIND_LIBS_LWRES:= no
+MK_BIND_MTREE:=	no
+MK_BIND_NAMED:=	no
+MK_BIND_UTILS:=	no
+.endif
+
+.if ${MK_CRYPT} == "no"
+MK_OPENSSL:=	no
+MK_OPENSSH:=	no
+MK_KERBEROS:=	no
+.endif
+
+.if ${MK_CXX} == "no"
+MK_COLLECT2:=	no
+.endif
+
+.if ${MK_OPENSSL} == "no"
+MK_OPENSSH:=	no
+MK_KERBEROS:=	no
+.endif
+
+.if ${MK_PF} == "no"
+MK_AUTHPF:=	no
+.endif
+
+.if ${MK_TOOLCHAIN} == "no"
+MK_GDB:=	no
+.endif
+
+#
+# Set defaults for the MK_*_SUPPORT variables.
+#
+
+#
+# MK_*_SUPPORT options which default to "yes" unless their corresponding
+# MK_* variable is set to "no".
+#
+.for var in \
+    GNU \
+    HESIOD \
+    INET6 \
+    IPX \
+    KERBEROS \
+    PAM
+.if defined(WITH_${var}_SUPPORT) && defined(WITHOUT_${var}_SUPPORT)
+.error WITH_${var}_SUPPORT and WITHOUT_${var}_SUPPORT can't both be set.
+.endif
+.if defined(MK_${var}_SUPPORT)
+.error MK_${var}_SUPPORT can't be set by a user.
+.endif
+.if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no"
+MK_${var}_SUPPORT:= no
+.else
+MK_${var}_SUPPORT:= yes
+.endif
+.endfor
+
 .endif	# !target(__<bsd.own.mk>__)

share/mk/bsd.prog.mk

@@ -74,7 +74,7 @@ ${PROG}: ${OBJS}
 
 .endif
 
-.if	!defined(NO_MAN) && !defined(MAN) && \
+.if	${MK_MAN} != "no" && !defined(MAN) && \
 	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
 	!defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
 	!defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \
@@ -85,7 +85,7 @@ MAN1=	${MAN}
 .endif
 
 all: objwarn ${PROG} ${SCRIPTS}
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
 all: _manpages
 .endif
 
@@ -177,7 +177,7 @@ NLSNAME?=	${PROG}
 .include <bsd.incs.mk>
 .include <bsd.links.mk>
 
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
 realinstall: _maninstall
 .ORDER: beforeinstall _maninstall
 .endif
@@ -191,7 +191,7 @@ lint: ${SRCS:M*.c}
 .endif
 .endif
 
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
 .include <bsd.man.mk>
 .endif
 

sys/Makefile

@@ -1,7 +1,9 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # The boot loader
-.if !defined(NO_BOOT)
+.if ${MK_BOOT} != "no"
 .if ${MACHINE_ARCH} != "arm"
 SUBDIR=	boot
 .endif

sys/boot/Makefile

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-.if !defined(NO_FORTH)
+.include <bsd.own.mk>
+
+.if ${MK_FORTH} != "no"
 # Build the add-in FORTH interpreter.
 SUBDIR+=		ficl
 .endif

sys/boot/alpha/common/Makefile.common

@@ -2,6 +2,8 @@
 #
 # Common Alpha loader build rules
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../common
 
 PROG=		${BOOT}.sym
@@ -15,7 +17,7 @@ SRCS+=		dev_net.c
 
 .PATH: ${.CURDIR}/../libalpha
 
-.if !defined(NO_FORTH)
+.if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH

sys/boot/i386/loader/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=		loader.sym
 INTERNALPROG=
 NEWVERSWHAT=	"bootstrap loader" i386
@@ -18,7 +20,7 @@ CFLAGS+=	-DLOADER_NFS_SUPPORT
 HAVE_PNP=	yes
 HAVE_ISABUS=	yes
 
-.if !defined(NO_FORTH)
+.if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386

sys/boot/ia64/efi/Makefile

@@ -1,9 +1,12 @@
 # $FreeBSD$
 
+NO_MAN=
+
+.include <bsd.own.mk>
+
 PROG=		loader.sym
 INTERNALPROG=
 SRCS=		conf.c dev_net.c efimd.c main.c start.S vers.c
-NO_MAN=
 
 CFLAGS+=	-DLOADER
 CFLAGS+=	-I${.CURDIR}/../../efi/include
@@ -11,7 +14,7 @@ CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
 CFLAGS+=	-I${.CURDIR}/../../efi/libefi
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
 
-.if !defined(NO_FORTH)
+.if ${MK_FORTH} != "no"
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH
 CFLAGS+=	-I${.CURDIR}/../../ficl

sys/boot/ia64/ski/Makefile

@@ -1,7 +1,10 @@
 # $FreeBSD$
 
-PROG=		skiload
 NO_MAN=
+
+.include <bsd.own.mk>
+
+PROG=		skiload
 NEWVERSWHAT=	"ia64 SKI boot" ${MACHINE_ARCH}
 STRIP=		# We must not strip skiload at install time.
 
@@ -16,7 +19,7 @@ CFLAGS+=	-I${.CURDIR}/../../efi/include
 CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
 LDFLAGS=	-Wl,-T${.CURDIR}/ldscript.ia64
 
-.if !defined(NO_FORTH)
+.if ${MK_FORTH} != "no"
 CFLAGS+=	-DBOOT_FORTH
 CFLAGS+=	-I${.CURDIR}/../../ficl
 CFLAGS+=	-I${.CURDIR}/../../ficl/${MACHINE_ARCH}

sys/boot/pc98/loader/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=		loader.sym
 INTERNALPROG=
 NEWVERSWHAT=	"bootstrap loader" pc98
@@ -19,7 +21,7 @@ CFLAGS+=	-DLOADER_NFS_SUPPORT
 HAVE_PNP=	yes
 HAVE_ISABUS=	yes
 
-.if !defined(NO_FORTH)
+.if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386

sys/boot/powerpc/loader/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=		loader
 NEWVERSWHAT=	"bootstrap loader" "Open Firmware/PowerPC"
 BINDIR?=	/boot
@@ -46,7 +48,7 @@ CFLAGS+=	-DLOADER_NFS_SUPPORT
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .endif
 
-.if !defined(NO_FORTH)
+.if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc

sys/boot/powerpc/ofw/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=		loader
 NEWVERSWHAT=	"bootstrap loader" "Open Firmware/PowerPC"
 BINDIR?=	/boot
@@ -46,7 +48,7 @@ CFLAGS+=	-DLOADER_NFS_SUPPORT
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .endif
 
-.if !defined(NO_FORTH)
+.if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc

sys/boot/sparc64/loader/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=		loader
 NEWVERSWHAT=	"bootstrap loader" sparc64
 INSTALLFLAGS=	-b
@@ -41,7 +43,7 @@ CFLAGS+=	-DLOADER_NFS_SUPPORT
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .endif
 
-.if !defined(NO_FORTH)
+.if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/sparc64

sys/modules/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=	${_3dfx} \
 	${_3dfx_linux} \
 	${_aac} \
@@ -295,7 +297,7 @@ _vpo=		vpo
 _ufs=		ufs
 .endif
 
-.if !defined(NO_CRYPT) || defined(ALL_MODULES)
+.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 .if exists(${.CURDIR}/../opencrypto)
 _crypto=	crypto
 _cryptodev=	cryptodev
@@ -305,11 +307,11 @@ _random=	random
 .endif
 .endif
 
-.if !defined(NO_IPFILTER) || defined(ALL_MODULES)
+.if ${MK_IPFILTER} != "no" || defined(ALL_MODULES)
 _ipfilter=	ipfilter
 .endif
 
-.if !defined(NO_PF) || defined(ALL_MODULES)
+.if ${MK_PF} != "no" || defined(ALL_MODULES)
 _pf=		pf
 _pflog=		pflog
 .endif
@@ -407,7 +409,7 @@ _ipw=		ipw
 _iwi=		iwi
 _mly=		mly
 _nve=		nve
-.if !defined(NO_CRYPT) || defined(ALL_MODULES)
+.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 .if exists(${.CURDIR}/../crypto/via)
 _padlock=	padlock
 .endif

sys/modules/dummynet/Makefile

@@ -1,12 +1,14 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH:  ${.CURDIR}/../../netinet
 KMOD=   dummynet
 SRCS=   ip_dummynet.c
 SRCS+=	opt_inet6.h
 
 .if !defined(KERNBUILDDIR)
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
 .endif

sys/modules/if_bridge/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH:	${.CURDIR}/../../net
 KMOD=	if_bridge
 SRCS=	if_bridge.c bridgestp.c opt_inet.h opt_inet6.h
@@ -8,7 +10,7 @@ SRCS=	if_bridge.c bridgestp.c opt_inet.h opt_inet6.h
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
 	
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
 .endif

sys/modules/if_gif/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
 
 KMOD=	if_gif
@@ -10,7 +12,7 @@ SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mac.h \
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
 
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
 .endif
@@ -20,11 +22,11 @@ opt_mrouting.h:
 .else
 OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h
 .if empty(OPT_INET6)
-NO_INET6=
+MK_INET6_SUPPORT= no
 .endif
 .endif
 
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 SRCS+=	in6_gif.c
 .endif