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)

25 files changed, 97 insertions, 49 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 920c339..4c52565 100644
--- a/lib/Makefile
+++ b/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
 
diff --git a/lib/bind/bind/Makefile b/lib/bind/bind/Makefile
index 452223b..c10025c 100644
--- a/lib/bind/bind/Makefile
+++ b/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 \
diff --git a/lib/bind/bind9/Makefile b/lib/bind/bind9/Makefile
index 3943bb8..68f72d7 100644
--- a/lib/bind/bind9/Makefile
+++ b/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
diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index 15d8122..d89207b 100644
--- a/lib/bind/config.mk
+++ b/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
diff --git a/lib/bind/dns/Makefile b/lib/bind/dns/Makefile
index 463dba7..04be449 100644
--- a/lib/bind/dns/Makefile
+++ b/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 \
diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile
index f34f808..0fd8342 100644
--- a/lib/bind/isc/Makefile
+++ b/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 \
diff --git a/lib/bind/isccc/Makefile b/lib/bind/isccc/Makefile
index 549afe3..84e1ba8 100644
--- a/lib/bind/isccc/Makefile
+++ b/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 \
diff --git a/lib/bind/isccfg/Makefile b/lib/bind/isccfg/Makefile
index 36ccf8b..6c2309c 100644
--- a/lib/bind/isccfg/Makefile
+++ b/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 \
diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile
index ec06a27..eef4589 100644
--- a/lib/bind/lwres/Makefile
+++ b/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)
-WITH_BIND_LIBS=
+.if ${MK_BIND_LIBS_LWRES} != "no"
+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 \
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index bfbfc33..70d48c9 100644
--- a/lib/libc/Makefile
+++ b/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
 
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index a176123..8a8a381 100644
--- a/lib/libc/net/Makefile.inc
+++ b/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
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 6082f6a..8dd31b4 100644
--- a/lib/libcrypt/Makefile
+++ b/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
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 1b69c49..bcd5214 100644
--- a/lib/libfetch/Makefile
+++ b/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
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index 2a60d93..542310c 100644
--- a/lib/libipsec/Makefile
+++ b/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
 
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile
index 41db418..9ce6bcf 100644
--- a/lib/libmilter/Makefile
+++ b/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
 
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index d372af0..aa541ea 100644
--- a/lib/libncurses/Makefile
+++ b/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
diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc
index c721075..c570cfd 100644
--- a/lib/libpam/modules/modules.inc
+++ b/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
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index fde40fe..385cb9c 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/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
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index ec4c9fd..8f95ddd 100644
--- a/lib/libpcap/Makefile
+++ b/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
 
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index 2c89597..4102e1b 100644
--- a/lib/libradius/Makefile
+++ b/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
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 6ced099..3939a6a 100644
--- a/lib/librpcsvc/Makefile
+++ b/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
 
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index 12a73d7..4439b4a 100644
--- a/lib/libsm/Makefile
+++ b/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
 
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 38f73a4..eda86aa 100644
--- a/lib/libtelnet/Makefile
+++ b/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
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 1f3ccd0..c477b38 100644
--- a/lib/libwrap/Makefile
+++ b/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
 
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index d372af0..aa541ea 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/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