Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)

4 files changed, 30 insertions, 28 deletions

diff --git a/etc/Makefile b/etc/Makefile
index d1045f8..9933975 100644
--- a/etc/Makefile
+++ b/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 !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 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 !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 	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,18 +158,16 @@ 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 !defined(NO_BIND_ETC)
+.if ${MK_BIND_ETC} != "no"
 	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
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
@@ -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 defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 	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 !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 	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
diff --git a/etc/hosts.allow b/etc/hosts.allow
index 5af0f0e..d8f8c6c 100644
--- a/etc/hosts.allow
+++ b/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
 
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 10816e4..de69da9 100644
--- a/etc/mtree/Makefile
+++ b/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
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 3743975..52a833d 100755
--- a/etc/rc.d/Makefile
+++ b/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